add

xiaofang/Assets/Res.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dcbae744de643e849bd59ace4516ac3c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Res/login.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a70283aec1aa51a4cb0aecd68f011bb9
+guid: 1c83ee8c0e91717409e75876ac144c11
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

xiaofang/Assets/Res/login/btn_close.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 15ff0b33a851bf744b7beb9db5ba6ee6
+guid: 08fb38a932d777c45ba07d51cecafd06
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -89,6 +89,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

xiaofang/Assets/Res/login/btn_commongray.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f3504d81690e0f840bdaf0372b887e47
+guid: e0f1793b6faa8dd40aa87abacf515792
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -89,6 +89,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

xiaofang/Assets/Res/login/frame_commonbox01.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9d826dee5aabb5f41b0fececa4da297f
+guid: ce60347256dc3464592ad324b5d5d325
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -89,6 +89,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

xiaofang/Assets/Res/login/frame_commontxtbox.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 74086e89ed6234b4184c1ebde98341c2
+guid: 166caff9155807b4687320745281a888
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -89,6 +89,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

xiaofang/Assets/Res/login/icn_warning.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 59e34fe7c54576a47b1685c5fe4ceea1
+guid: 3dbf50aaab307a14a813f709b513311f
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -89,6 +89,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

xiaofang/Assets/Res/login/line_common01.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7b1e85736e1cbbf4ea0ca100ec695ab1
+guid: 27e4dcc3b3b4afc46b0a347d5f4c88f9
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -89,6 +89,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

xiaofang/Assets/Res/login/tab_tc_selected01.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f8b8a32a175c4ca49b5fe4f9696d32c3
+guid: 5698e813650f91c43abad60040ef760e
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -89,6 +89,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

xiaofang/Assets/Resources/Ain/CharacterAin.controller

@@ -528,7 +528,7 @@ AnimatorStateTransition:
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.75
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
@@ -572,10 +572,10 @@ AnimatorStateMachine:
     m_Position: {x: -90, y: 150, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 6829205012534560520}
-    m_Position: {x: -70, y: 20, z: 0}
+    m_Position: {x: -90, y: 50, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -5372403944836134530}
-    m_Position: {x: 314.75653, y: 151.7941, z: 0}
+    m_Position: {x: 150, y: 150, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 4291779112698354951}
     m_Position: {x: -420, y: 150, z: 0}
@@ -750,7 +750,7 @@ AnimatorStateTransition:
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.75
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
@@ -775,7 +775,7 @@ AnimatorStateTransition:
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.75
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1

xiaofang/Assets/Scenes/Tmap.unity

@@ -2254,6 +2254,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: NoFire
       objectReference: {fileID: 0}
+    - target: {fileID: 7104765112034956014, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3}
       propertyPath: m_RootOrder
       value: 11
@@ -4199,6 +4203,11 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1511130762 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3608877410834662313, guid: 006066e2380528243a52cbfc56f6d189, type: 3}
+  m_PrefabInstance: {fileID: 4527286628662154822}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1511894438
 GameObject:
   m_ObjectHideFlags: 0
@@ -5681,6 +5690,20 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3}
   m_PrefabInstance: {fileID: 4527286628662154822}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &543450652475625313
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1511130762}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a03ec7aa563e32d4ea7ce35cdd3e6f2b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Mp: 0
+  Def: 0
 --- !u!1 &1242008297200351719 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5795828957522809712, guid: 2c4a835a9676e1a478c77d64f472c3ec, type: 3}

xiaofang/Assets/Script/Character/CharacterInfo.cs

@@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CharacterInfo : MonoBehaviour
+{
+
+    public float Mp;//½¡¿µÖµ
+    public float Def;//»¤¼×
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    public void ChangeHp()
+    {
+        Debug.LogError("¿ÛѪ");
+    }
+}

xiaofang/Assets/Script/Character/CharacterInfo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a03ec7aa563e32d4ea7ce35cdd3e6f2b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs

@@ -44,7 +44,7 @@ public class Skill_Pick : MonoBehaviour
         Vector3 playerPosition = transform.position;
 
         // 使用物理射线或重叠球检测来查找玩家附近的物品  
-        Collider[] itemsInRange = Physics.OverlapSphere(playerPosition, pickUpRange, LayerMask.GetMask("CanPick"));
+        Collider[] itemsInRange = Physics.OverlapSphere(playerPosition, pickUpRange, LayerMask.GetMask("Default"));
 
         // 遍历检测到的物品  
         foreach (Collider itemCollider in itemsInRange)
@@ -71,12 +71,12 @@ public class Skill_Pick : MonoBehaviour
     }
 
     // 丢弃物品  
-    public void Drop(GameObject currentItem)
+    public GameObject Drop(GameObject currentItem)
     {
         // 检查当前是否有持有的物品  
         if (currentItem == null)
         {
-            return;
+            return null;
         }
         // 将物品从玩家的子对象中移除  
         Transform itemTransform = currentItem.transform;
@@ -97,6 +97,8 @@ public class Skill_Pick : MonoBehaviour
 
         // 清除当前持有的物品  
         currentItem = null;
+
+        return currentItem;
     }
 
 

xiaofang/Assets/Script/Character/Skills/UseSkill.cs

@@ -42,11 +42,12 @@ public class UseSkill : MonoBehaviour
     {
         if (Input.GetKeyDown(KeyCode.F))
         {
+            Debug.LogError("F");
             currentItem = skill_Pick.Pick();
         }
         if (Input.GetKeyDown(KeyCode.Q))
         {
-            skill_Pick.Drop(currentItem);
+            currentItem = skill_Pick.Drop(currentItem);
         }
     }
 

xiaofang/Assets/Script/Item/Fire.cs

@@ -15,6 +15,8 @@ public class Fire : MonoBehaviour
     private bool isExtinguishing = false;  // 是否正在灭火
     public float extinguishTime = 3.0f;    // 灭火所需的时间
     private float holdTime = 0f;           // 按住按钮的计时
+
+    
   //private Firestate firestate = Firestate.NotExtinguishFire;
     
     private CharacterControl characterControl;//玩家控制器
@@ -26,6 +28,14 @@ public class Fire : MonoBehaviour
 
    
     void Update()
+    {
+       
+    }
+
+
+
+
+    void MieFire()
     {
         // 检查玩家是否在范围内且按住灭火键
         if (isPlayerInRange && Input.GetMouseButton(0))
@@ -43,9 +53,9 @@ public class Fire : MonoBehaviour
                 isExtinguishing = true;  // 防止重复触发灭火
             }
         }
-        else if(isPlayerInRange)
+        else
         {
-            Debug.Log("ËÉ¿ª°´¼ü");
+            //Debug.Log("ËÉ¿ª°´¼ü");
             // 如果玩家松开按键或者离开范围，重置计时
             holdTime = 0f;
             isExtinguishing = false;
@@ -54,6 +64,9 @@ public class Fire : MonoBehaviour
         }
     }
 
+
+
+
     // 开始火焰
     public void StartFire()
     {

xiaofang/Assets/Script/UI/loginPanel.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class loginPanel : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

xiaofang/Assets/Script/UI/loginPanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b75bb6500d750284287f0b3dcbbaf1b1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: