begin ui building

lyt0628 · Feb 22, 2025 · 86f630f · 86f630f
1 parent 5fcd324
commit 86f630f
Show file tree

Hide file tree

Showing 528 changed files with 87,152 additions and 12,963 deletions.
diff --git a/src/.vs/Assembly-CSharp-Editor-firstpass.csproj.dtbcache.json b/src/.vs/Assembly-CSharp-Editor-firstpass.csproj.dtbcache.json
diff --git a/src/.vs/Assembly-CSharp-Editor.csproj.dtbcache.json b/src/.vs/Assembly-CSharp-Editor.csproj.dtbcache.json
diff --git a/src/.vs/Assembly-CSharp-firstpass.csproj.dtbcache.json b/src/.vs/Assembly-CSharp-firstpass.csproj.dtbcache.json
diff --git a/src/.vs/Assembly-CSharp.csproj.dtbcache.json b/src/.vs/Assembly-CSharp.csproj.dtbcache.json
diff --git a/src/.vs/QS.Agent.csproj.dtbcache.json b/src/.vs/QS.Agent.csproj.dtbcache.json
diff --git a/src/.vs/QS.Player.csproj.dtbcache.json b/src/.vs/QS.Player.csproj.dtbcache.json
diff --git a/src/.vs/src/CopilotIndices/17.12.38.29086/CodeChunks.db b/src/.vs/src/CopilotIndices/17.12.38.29086/CodeChunks.db
diff --git a/src/.vs/src/CopilotIndices/17.12.38.29086/CodeChunks.db-shm b/src/.vs/src/CopilotIndices/17.12.38.29086/CodeChunks.db-shm
diff --git a/src/.vs/src/CopilotIndices/17.12.38.29086/CodeChunks.db-wal b/src/.vs/src/CopilotIndices/17.12.38.29086/CodeChunks.db-wal
diff --git a/src/.vs/src/CopilotIndices/17.12.38.29086/SemanticSymbols.db b/src/.vs/src/CopilotIndices/17.12.38.29086/SemanticSymbols.db
diff --git a/src/.vs/src/CopilotIndices/17.12.38.29086/SemanticSymbols.db-shm b/src/.vs/src/CopilotIndices/17.12.38.29086/SemanticSymbols.db-shm
diff --git a/src/.vs/src/CopilotIndices/17.12.38.29086/SemanticSymbols.db-wal b/src/.vs/src/CopilotIndices/17.12.38.29086/SemanticSymbols.db-wal
diff --git a/src/.vs/src/FileContentIndex/02f501c3-b392-410d-968f-1e4374e11aac.vsidx b/src/.vs/src/FileContentIndex/02f501c3-b392-410d-968f-1e4374e11aac.vsidx
diff --git a/src/.vs/src/FileContentIndex/0c5b3793-5a96-44d1-be20-d79b18dd86c1.vsidx b/src/.vs/src/FileContentIndex/0c5b3793-5a96-44d1-be20-d79b18dd86c1.vsidx
diff --git a/src/.vs/src/FileContentIndex/204e9dcb-56d5-49d2-ac23-3477e793a754.vsidx b/src/.vs/src/FileContentIndex/204e9dcb-56d5-49d2-ac23-3477e793a754.vsidx
diff --git a/src/.vs/src/FileContentIndex/243738e7-bd69-4d55-b78d-08ec416091c6.vsidx b/src/.vs/src/FileContentIndex/243738e7-bd69-4d55-b78d-08ec416091c6.vsidx
diff --git a/src/.vs/src/FileContentIndex/53794246-3ea4-4d1b-af46-14181468e393.vsidx b/src/.vs/src/FileContentIndex/53794246-3ea4-4d1b-af46-14181468e393.vsidx
diff --git a/src/.vs/src/FileContentIndex/56e61c35-d8a6-4a64-a76e-5ea265a65ec1.vsidx b/src/.vs/src/FileContentIndex/56e61c35-d8a6-4a64-a76e-5ea265a65ec1.vsidx
diff --git a/src/.vs/src/FileContentIndex/5d2af42d-ef23-4c83-8927-d00df09d8a1e.vsidx b/src/.vs/src/FileContentIndex/5d2af42d-ef23-4c83-8927-d00df09d8a1e.vsidx
diff --git a/src/.vs/src/FileContentIndex/7183a360-9138-411c-be79-56d8674f81bb.vsidx b/src/.vs/src/FileContentIndex/7183a360-9138-411c-be79-56d8674f81bb.vsidx
diff --git a/src/.vs/src/FileContentIndex/b0c049d1-77f9-4087-9acc-65f21d70142a.vsidx b/src/.vs/src/FileContentIndex/b0c049d1-77f9-4087-9acc-65f21d70142a.vsidx
diff --git a/src/.vs/src/FileContentIndex/d478409e-0f57-4315-8731-ca94598dafd2.vsidx b/src/.vs/src/FileContentIndex/d478409e-0f57-4315-8731-ca94598dafd2.vsidx
diff --git a/src/.vs/src/v17/DocumentLayout.backup.json b/src/.vs/src/v17/DocumentLayout.backup.json
diff --git a/src/.vs/src/v17/DocumentLayout.json b/src/.vs/src/v17/DocumentLayout.json
diff --git a/src/.vs/src/v17/HierarchyCache.v1.txt b/src/.vs/src/v17/HierarchyCache.v1.txt
diff --git a/src/.vs/src/v17/fileList.bin b/src/.vs/src/v17/fileList.bin
diff --git a/src/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/src/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: f61930a8464308a4a97129856cdc6098
   m_currentHash:
     serializedVersion: 2
-    Hash: 665851256b4111048b99bebe974f3587
+    Hash: 61deb52c98ed5ee851d19e1b189bfc47
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_BundleLocalCatalog: 0
@@ -86,7 +86,9 @@ MonoBehaviour:
     m_ProfileVersion: 1
   m_LabelTable:
     m_LabelNames:
-    - SimpleSkillConf
+    - Conf_SimpleSkill
+    - Conf_Prop
+    - Conf_Weapon
   m_SchemaTemplates: []
   m_GroupTemplateObjects:
   - {fileID: 11400000, guid: ac9cd504153c42c408cecece11e8d047, type: 2}

diff --git a/src/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/src/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
@@ -17,6 +17,16 @@ MonoBehaviour:
     m_SerializedData: []
   m_GUID: f61930a8464308a4a97129856cdc6098
   m_SerializeEntries:
+  - m_GUID: 2397fb494d90ad64ba47e7ee7006ebfe
+    m_Address: img_prop_hpBottle
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 364fc5d892924184183be9d67f7bccf9
+    m_Address: Slot
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 487328560927a9842bd8b1cd3a903487
     m_Address: PF_Frame_001
     m_ReadOnly: 0
@@ -32,33 +42,71 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 8a113e6a5cddd8542b369734d0c837c1
+    m_Address: Assets/Conf/Props/Conf_MPBottle.toml
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - Conf_Prop
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 8af33adf502022646aee3da20c5d14eb
+    m_Address: Assets/Conf/Props/Conf_HPBottle.toml
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - Conf_Prop
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 9438d9337d063c940a06f9b45a4d864e
-    m_Address: Conf_Items
+    m_Address: Assets/Conf/Weapons/Conf_RustSword.toml
     m_ReadOnly: 0
-    m_SerializedLabels: []
+    m_SerializedLabels:
+    - Conf_Weapon
     FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: b11a6c1676493dd4093faec33da4e8dd
     m_Address: Assets/Conf/SimpleSkillConfigurations/SK00002_Tap.toml
     m_ReadOnly: 0
     m_SerializedLabels:
-    - SimpleSkillConf
+    - Conf_SimpleSkill
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: b5f1e3dd6f32d6d479b88d6eeb9357e9
+    m_Address: img_prop_mpBottle
+    m_ReadOnly: 0
+    m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: bc735d9bb653b5640b31c675d5837a30
     m_Address: Conf_SimpleSkills
     m_ReadOnly: 0
     m_SerializedLabels:
-    - SimpleSkillConf
+    - Conf_SimpleSkill
     FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: bd9598c8433f94348abffc43ee094164
     m_Address: PUI_MainHUD
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: d07c8764a67b0484295d9d0aedfcd0a3
+    m_Address: Img_LightBox
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: d43a84137ea2198409ec3203587895db
     m_Address: RustSword
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: dfd971fbf2cd8544ab76ca5c4c99e60e
+    m_Address: LP_Test
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: e804902833965b446a3c2a8918dd25c9
+    m_Address: PUI_Inventory
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: ea04d9d32721c124395dbf467f37c6f8
+    m_Address: img_weapon_rustSword
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: d9dba873d407fed4080bbf7796051001, type: 2}
   m_SchemaSet:

diff --git a/src/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/src/Assets/AddressableAssetsData/Windows/addressables_content_state.bin
diff --git a/src/Assets/AddressableAssetsData/link.xml b/src/Assets/AddressableAssetsData/link.xml
diff --git a/src/Assets/Model/Common.meta → src/Assets/Conf/Props.meta b/src/Assets/Model/Common.meta → src/Assets/Conf/Props.meta
diff --git a/src/Assets/Conf/Props/Conf_HPBottle.toml b/src/Assets/Conf/Props/Conf_HPBottle.toml
@@ -0,0 +1,6 @@
+# 
+[[Props]]
+Name = "HpBottle"
+Image = "img_prop_hpBottle"
+Prefab = "HpBottle"
+Description = "Recovery a little HP"
diff --git a/src/Assets/Conf/Props/Conf_HPBottle.toml.meta b/src/Assets/Conf/Props/Conf_HPBottle.toml.meta
diff --git a/src/Assets/Conf/Props/Conf_MPBottle.toml b/src/Assets/Conf/Props/Conf_MPBottle.toml
@@ -0,0 +1,6 @@
+# 
+[[Props]]
+Name = "MpBottle"
+Image = "img_prop_mpBottle"
+Prefab = "MpBottle"
+Description = "Recovery a little MP"
diff --git a/src/Assets/Conf/Props/Conf_MPBottle.toml.meta b/src/Assets/Conf/Props/Conf_MPBottle.toml.meta
diff --git a/src/Assets/LuaScript/Control.meta → src/Assets/Conf/Quests.meta b/src/Assets/LuaScript/Control.meta → src/Assets/Conf/Quests.meta
diff --git a/src/Assets/Conf/SimpleSkillConfigurations/SK00002_Tap.toml b/src/Assets/Conf/SimpleSkillConfigurations/SK00002_Tap.toml
@@ -5,14 +5,14 @@ Type = "Phased"
 
 [[Skills.Phases]]
 Key = {No="00002", Name="Tap"}
-Handlers = ['Mount', 'CollideAttack', 'Scriptable']
+Handlers = [ 'CollideAttack', 'Mount', 'Scriptable']
 
 Attack={Atk=10.0, Matk=1.0}
-Colliders=['W_Sword']
+Colliders=['ATK_RHand']
 
 [[Skills.Phases.Mount.Casting.Prefabs]] # 定義爲階段下的預製體子表
 Address = 'PF_Frame_001' # 預製體的索引
-MountPoint = "W_Sword"
+MountPoint = "ATK_RHand"
 InWorldSpace= false
 DestroyDelay=1.0
 

diff --git a/src/Assets/LuaScript/QLua.meta → src/Assets/Conf/Weapons.meta b/src/Assets/LuaScript/QLua.meta → src/Assets/Conf/Weapons.meta
diff --git a/src/Assets/Conf/Conf_Items.toml → src/Assets/Conf/Weapons/Conf_RustSword.toml b/src/Assets/Conf/Conf_Items.toml → src/Assets/Conf/Weapons/Conf_RustSword.toml
@@ -4,7 +4,7 @@
 # 相同的地方是 可能（基本上是一定是）需要覆蓋 Aniamtor，
 [[weapons]]
 Name = "RustSword"
-Sprite = "RustSword64x64"
+Image = "img_weapon_rustSword"
 Prefab = "RustSword" # 從3D軟件導入的模型也是有物體概念的，這些物體 被理解爲 Unity的 Prefab 
-Description = "A sword for fighting"
+Description = "Rust Sword， it seems bad soon"
 MainBuff = { Type = 'Attack',  AtkRatio = 1.1, MatkRatio = 1.1 }
diff --git a/src/Assets/Conf/Conf_Items.toml.meta → ...ets/Conf/Weapons/Conf_RustSword.toml.meta b/src/Assets/Conf/Conf_Items.toml.meta → ...ets/Conf/Weapons/Conf_RustSword.toml.meta
diff --git a/src/Assets/Editor/CustomTextAssetImporter.cs b/src/Assets/Editor/CustomTextAssetImporter.cs
@@ -11,12 +11,12 @@ public class CustomTextAssetImporter : ScriptedImporter
 {
     public override void OnImportAsset(AssetImportContext ctx)
     {
-        string content = File.ReadAllText(ctx.assetPath);  
+        string content = File.ReadAllText(ctx.assetPath, System.Text.Encoding.UTF8);  
 
         TextAsset textAsset = new(content);
         var hash = new HashCode();
         hash.Add(content);
-        
+
         ctx.AddObjectToAsset(hash.ToHashCode().ToString(), textAsset);
         ctx.SetMainObject(textAsset);
 

diff --git a/src/Assets/LuaScript/Control/MoveControl.lua b/src/Assets/LuaScript/Control/MoveControl.lua
diff --git a/src/Assets/LuaScript/WorldItem.meta → src/Assets/LuaScript/Props.meta b/src/Assets/LuaScript/WorldItem.meta → src/Assets/LuaScript/Props.meta
diff --git a/src/Assets/LuaScript/Props/LP_Test.Lua b/src/Assets/LuaScript/Props/LP_Test.Lua
@@ -0,0 +1,2 @@
+DebugLog("Is Frozen:")
+DebugLog(playerData.ActivedCharacter.Frozen)
diff --git a/src/Assets/LuaScript/Props/LP_Test.Lua.meta b/src/Assets/LuaScript/Props/LP_Test.Lua.meta
diff --git a/src/Assets/LuaScript/QLua/Test.lua b/src/Assets/LuaScript/QLua/Test.lua
diff --git a/src/Assets/Model/Chara/Animation/Skeleton_UnityHumanoid/Skeleton@TapCombo.fbx b/src/Assets/Model/Chara/Animation/Skeleton_UnityHumanoid/Skeleton@TapCombo.fbx
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		DebugLog("Is Frozen:")
		DebugLog(playerData.ActivedCharacter.Frozen)