From 4fd2efa5888a69b12fa314fb13ca004b5d0178ba Mon Sep 17 00:00:00 2001 From: Chomper9981 Date: Wed, 1 Apr 2026 17:41:42 +0700 Subject: [PATCH] Fix some minor bug. Add some addreasable and UI component --- .../AddressableAssetSettings.asset | 2 +- .../AssetGroups/gfx.asset | 14 +-- .../人物技能}/击中/击退矢-击中.prefab | 0 .../人物技能}/击中/击退矢-击中.prefab.meta | 0 .../人物技能}/击中/引而不发击中.prefab | 0 .../人物技能}/击中/引而不发击中.prefab.meta | 0 .../人物技能}/击中/连射击中.prefab | 0 .../人物技能}/击中/连射击中.prefab.meta | 0 .../人物技能}/飞行/击退矢-飞行.prefab | 0 .../人物技能}/飞行/击退矢-飞行.prefab.meta | 0 .../人物技能}/飞行/引而不发飞行.prefab | 10 +- .../人物技能}/飞行/引而不发飞行.prefab.meta | 0 .../人物技能}/飞行/连射飞行.prefab | 18 ++-- .../人物技能}/飞行/连射飞行.prefab.meta | 0 .../weapons/人物/弓弩/弓/木弓/木弓.prefab | 6 +- .../weapons/人物/弓弩/弓/木弓/木弓极品.prefab | 6 +- .../weapons/人物/弓弩/弓/长弓/长弓.prefab | 6 +- .../weapons/人物/弓弩/弓/长弓/长弓极品.prefab | 6 +- .../Scripts/UI/DlgAward/CDlgAward.cs | 2 +- Assets/Prefabs/UI/CreateCharacterUI.prefab | 101 +++++++++++------- 20 files changed, 96 insertions(+), 75 deletions(-) rename Assets/ModelRenderer/Art/Gfx/gfx/{程序联入 => 策划联入/人物技能}/击中/击退矢-击中.prefab (100%) rename Assets/ModelRenderer/Art/Gfx/gfx/{程序联入 => 策划联入/人物技能}/击中/击退矢-击中.prefab.meta (100%) rename Assets/ModelRenderer/Art/Gfx/gfx/{程序联入 => 策划联入/人物技能}/击中/引而不发击中.prefab (100%) rename Assets/ModelRenderer/Art/Gfx/gfx/{程序联入 => 策划联入/人物技能}/击中/引而不发击中.prefab.meta (100%) rename Assets/ModelRenderer/Art/Gfx/gfx/{程序联入 => 策划联入/人物技能}/击中/连射击中.prefab (100%) rename Assets/ModelRenderer/Art/Gfx/gfx/{程序联入 => 策划联入/人物技能}/击中/连射击中.prefab.meta (100%) rename Assets/ModelRenderer/Art/Gfx/gfx/{程序联入 => 策划联入/人物技能}/飞行/击退矢-飞行.prefab (100%) rename Assets/ModelRenderer/Art/Gfx/gfx/{程序联入 => 策划联入/人物技能}/飞行/击退矢-飞行.prefab.meta (100%) rename Assets/ModelRenderer/Art/Gfx/gfx/{程序联入 => 策划联入/人物技能}/飞行/引而不发飞行.prefab (99%) mode change 100755 => 100644 rename Assets/ModelRenderer/Art/Gfx/gfx/{程序联入 => 策划联入/人物技能}/飞行/引而不发飞行.prefab.meta (100%) rename Assets/ModelRenderer/Art/Gfx/gfx/{程序联入 => 策划联入/人物技能}/飞行/连射飞行.prefab (99%) mode change 100755 => 100644 rename Assets/ModelRenderer/Art/Gfx/gfx/{程序联入 => 策划联入/人物技能}/飞行/连射飞行.prefab.meta (100%) diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index dc5972c588..ba4ae5f3bf 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 712e3991f28e549e7a56ee582a977810 m_currentHash: serializedVersion: 2 - Hash: 698660c3c48b589bc0c20b8b3d3ac808 + Hash: 00000000000000000000000000000000 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/gfx.asset b/Assets/AddressableAssetsData/AssetGroups/gfx.asset index 3da199fe2c..f2b2668e6a 100644 --- a/Assets/AddressableAssetsData/AssetGroups/gfx.asset +++ b/Assets/AddressableAssetsData/AssetGroups/gfx.asset @@ -51,7 +51,7 @@ MonoBehaviour: m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 161e9a4c17714de4f81c962f2321e602 - m_Address: "gfx/\u7A0B\u5E8F\u8054\u5165/\u51FB\u4E2D/\u51FB\u9000\u77E2-\u51FB\u4E2D.gfx" + m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u51FB\u4E2D/\u51FB\u9000\u77E2-\u51FB\u4E2D.gfx" m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 @@ -81,7 +81,7 @@ MonoBehaviour: m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 1f1eb54181be4e341b8fc5cf2671d172 - m_Address: "gfx/\u7A0B\u5E8F\u8054\u5165/\u51FB\u4E2D/\u8FDE\u5C04\u51FB\u4E2D.gfx" + m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u51FB\u4E2D/\u8FDE\u5C04\u51FB\u4E2D.gfx" m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 @@ -146,7 +146,7 @@ MonoBehaviour: m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 35b914f3bf688fc4db189d6ab204e1cd - m_Address: "gfx/\u7A0B\u5E8F\u8054\u5165/\u51FB\u4E2D/\u5F15\u800C\u4E0D\u53D1\u51FB\u4E2D.gfx" + m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u51FB\u4E2D/\u5F15\u800C\u4E0D\u53D1\u51FB\u4E2D.gfx" m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 @@ -406,7 +406,7 @@ MonoBehaviour: m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 8ae0bf73136dc144ca84f14bcda75900 - m_Address: "gfx/\u7A0B\u5E8F\u8054\u5165/\u98DE\u884C/\u5F15\u800C\u4E0D\u53D1\u98DE\u884C.gfx" + m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u98DE\u884C/\u5F15\u800C\u4E0D\u53D1\u98DE\u884C.gfx" m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 @@ -501,7 +501,7 @@ MonoBehaviour: m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - m_GUID: b3de9a32d01f61646b4b44a80f30e1cd - m_Address: "gfx/\u7A0B\u5E8F\u8054\u5165/\u98DE\u884C/\u8FDE\u5C04\u98DE\u884C.gfx" + m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u98DE\u884C/\u8FDE\u5C04\u98DE\u884C.gfx" m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 @@ -566,12 +566,12 @@ MonoBehaviour: m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - m_GUID: d2fe87cdd491ffb47bd5f3fc0b2d2381 - m_Address: "gfx/\u7A0B\u5E8F\u8054\u5165/\u51FB\u4E2D/\u51B0\u96F9\u98DE\u884C.gfx" + m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u98DE\u884C/\u51B0\u96F9\u98DE\u884C.gfx" m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - m_GUID: d305326541524104787ec52d7a05a783 - m_Address: "gfx/\u7A0B\u5E8F\u8054\u5165/\u98DE\u884C/\u51FB\u9000\u77E2-\u98DE\u884C.gfx" + m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u98DE\u884C/\u51FB\u9000\u77E2-\u98DE\u884C.gfx" m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 diff --git a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/击中/击退矢-击中.prefab b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/击退矢-击中.prefab similarity index 100% rename from Assets/ModelRenderer/Art/Gfx/gfx/程序联入/击中/击退矢-击中.prefab rename to Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/击退矢-击中.prefab diff --git a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/击中/击退矢-击中.prefab.meta b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/击退矢-击中.prefab.meta similarity index 100% rename from Assets/ModelRenderer/Art/Gfx/gfx/程序联入/击中/击退矢-击中.prefab.meta rename to Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/击退矢-击中.prefab.meta diff --git a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/击中/引而不发击中.prefab b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/引而不发击中.prefab similarity index 100% rename from Assets/ModelRenderer/Art/Gfx/gfx/程序联入/击中/引而不发击中.prefab rename to Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/引而不发击中.prefab diff --git a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/击中/引而不发击中.prefab.meta b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/引而不发击中.prefab.meta similarity index 100% rename from Assets/ModelRenderer/Art/Gfx/gfx/程序联入/击中/引而不发击中.prefab.meta rename to Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/引而不发击中.prefab.meta diff --git a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/击中/连射击中.prefab b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/连射击中.prefab similarity index 100% rename from Assets/ModelRenderer/Art/Gfx/gfx/程序联入/击中/连射击中.prefab rename to Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/连射击中.prefab diff --git a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/击中/连射击中.prefab.meta b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/连射击中.prefab.meta similarity index 100% rename from Assets/ModelRenderer/Art/Gfx/gfx/程序联入/击中/连射击中.prefab.meta rename to Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/连射击中.prefab.meta diff --git a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/击退矢-飞行.prefab b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/击退矢-飞行.prefab similarity index 100% rename from Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/击退矢-飞行.prefab rename to Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/击退矢-飞行.prefab diff --git a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/击退矢-飞行.prefab.meta b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/击退矢-飞行.prefab.meta similarity index 100% rename from Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/击退矢-飞行.prefab.meta rename to Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/击退矢-飞行.prefab.meta diff --git a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/引而不发飞行.prefab b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/引而不发飞行.prefab old mode 100755 new mode 100644 similarity index 99% rename from Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/引而不发飞行.prefab rename to Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/引而不发飞行.prefab index 69ca2c87b4..7c4f0c418a --- a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/引而不发飞行.prefab +++ b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/引而不发飞行.prefab @@ -4959,7 +4959,7 @@ Transform: m_GameObject: {fileID: 4912589117491640153} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 2.006, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -9791,7 +9791,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6877296222040712388} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -9800,7 +9800,7 @@ Transform: - {fileID: 8410199637724557301} - {fileID: 6283989381095336921} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &8761650470351278108 ParticleSystem: m_ObjectHideFlags: 0 @@ -14627,13 +14627,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9056948034445225242} serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 170938213097180617} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &1179547747597600769 ParticleSystem: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/引而不发飞行.prefab.meta b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/引而不发飞行.prefab.meta similarity index 100% rename from Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/引而不发飞行.prefab.meta rename to Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/引而不发飞行.prefab.meta diff --git a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/连射飞行.prefab b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/连射飞行.prefab old mode 100755 new mode 100644 similarity index 99% rename from Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/连射飞行.prefab rename to Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/连射飞行.prefab index e5375b9442..e8b4ca99e4 --- a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/连射飞行.prefab +++ b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/连射飞行.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 260482212398831875} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 2.006, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4858,8 +4858,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4387082741573034301} serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 2.006, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4997,8 +4997,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4496088503787750417} serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 2.006, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -10069,7 +10069,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8221939480319025331} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -10080,7 +10080,7 @@ Transform: - {fileID: 7492997882020564551} - {fileID: 5091046501811248537} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &9165546058832794041 ParticleSystem: m_ObjectHideFlags: 0 @@ -14907,13 +14907,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8818734204388232933} serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8877989844552779624} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &854249251757314643 ParticleSystem: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/连射飞行.prefab.meta b/Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/连射飞行.prefab.meta similarity index 100% rename from Assets/ModelRenderer/Art/Gfx/gfx/程序联入/飞行/连射飞行.prefab.meta rename to Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/连射飞行.prefab.meta diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/木弓/木弓.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/木弓/木弓.prefab index 415d9c1e2f..fda7b5d49b 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/木弓/木弓.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/木弓/木弓.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7190750505348326392} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.07, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &1765069990502093261 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/木弓/木弓极品.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/木弓/木弓极品.prefab index bc7258bfdb..933e818ab7 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/木弓/木弓极品.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/木弓/木弓极品.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3254998395145552514} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.078459114, z: 0, w: 0.99691737} + m_LocalPosition: {x: 0, y: 0.07, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 9, z: 0} --- !u!33 &5725803900640895609 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/长弓/长弓.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/长弓/长弓.prefab index 16e1985a3d..7ae75ddbeb 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/长弓/长弓.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/长弓/长弓.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6957194932679918637} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &4168007957474647775 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/长弓/长弓极品.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/长弓/长弓极品.prefab index bbf9b63ade..19ebcbb0b0 100644 --- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/长弓/长弓极品.prefab +++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/弓弩/弓/长弓/长弓极品.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2268121912890350981} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &2253727715212905942 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/PerfectWorld/Scripts/UI/DlgAward/CDlgAward.cs b/Assets/PerfectWorld/Scripts/UI/DlgAward/CDlgAward.cs index adf8dc319f..2f43f22e63 100644 --- a/Assets/PerfectWorld/Scripts/UI/DlgAward/CDlgAward.cs +++ b/Assets/PerfectWorld/Scripts/UI/DlgAward/CDlgAward.cs @@ -373,7 +373,7 @@ namespace BrewMonster.Scripts.UI Toggle pRadio; uint idTask = GetData(); - for( int i = 1; i < _rowCount ; i++ ) + for( int i = 1; i <= _rowCount ; i++ ) { // sprintf(szName, "Rdo_Award%d", i); // pRadio = (PAUIRADIOBUTTON)GetDlgItem(szName); diff --git a/Assets/Prefabs/UI/CreateCharacterUI.prefab b/Assets/Prefabs/UI/CreateCharacterUI.prefab index 2c2b2b4fc6..6f11b2e883 100644 --- a/Assets/Prefabs/UI/CreateCharacterUI.prefab +++ b/Assets/Prefabs/UI/CreateCharacterUI.prefab @@ -154,7 +154,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7830628986027470164 RectTransform: m_ObjectHideFlags: 0 @@ -350,9 +350,9 @@ RectTransform: - {fileID: 7830628986027470164} m_Father: {fileID: 5444603765313937912} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 237.0925, y: -466.9} m_SizeDelta: {x: 474.185, y: 186.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2522115024558652584 @@ -973,7 +973,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 9030093368081429992} toggleTransition: 1 graphic: {fileID: 3438175197146392477} - m_Group: {fileID: 0} + m_Group: {fileID: 3011509526583693805} onValueChanged: m_PersistentCalls: m_Calls: @@ -1153,7 +1153,7 @@ GameObject: - component: {fileID: 8951551404941296338} - component: {fileID: 2636794002453100072} m_Layer: 5 - m_Name: professional_1 + m_Name: professional_0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1383,6 +1383,13 @@ MonoBehaviour: professionButtons: - {fileID: 2636794002453100072} - {fileID: 7693531075628788285} + - {fileID: 0} + - {fileID: 43840615540252804} + - {fileID: 7031816600200249011} + - {fileID: 0} + - {fileID: 2762528079727481461} + - {fileID: 6068983768154103059} + - {fileID: 0} maleGenderButton: {fileID: 4799972544958627575} femaleGenderButton: {fileID: 975101812964933518} nameInputField: {fileID: 5515740729786715052} @@ -1404,7 +1411,7 @@ GameObject: - component: {fileID: 8756397176823478499} - component: {fileID: 7693531075628788285} m_Layer: 5 - m_Name: professional_2 + m_Name: professional_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1739,7 +1746,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 580a6d6ccb718fe449afc60ac07f453f, type: 3} + m_Sprite: {fileID: 21300000, guid: d343ae9815bc2254f81442baf3a54901, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1971,7 +1978,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "Ki\u1EBFm kh\xE1ch" + m_text: "Th\u1EA7n th\xFA" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} m_sharedMaterial: {fileID: 9092487103257209053, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} @@ -2272,7 +2279,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c632a663a74e3fe45b6c207d9e32f869, type: 3} + m_Sprite: {fileID: 21300000, guid: f037841473253874e999b06a4f779c57, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2293,6 +2300,7 @@ GameObject: - component: {fileID: 5444603765313937912} - component: {fileID: 4021128748820168485} - component: {fileID: 9135338494670472884} + - component: {fileID: 3011509526583693805} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -2362,6 +2370,19 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &3011509526583693805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4148386573984726202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AllowSwitchOff: 1 --- !u!1 &4193010227581748059 GameObject: m_ObjectHideFlags: 0 @@ -2589,7 +2610,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 394619276425888084} toggleTransition: 1 graphic: {fileID: 4307557933304885974} - m_Group: {fileID: 0} + m_Group: {fileID: 3011509526583693805} onValueChanged: m_PersistentCalls: m_Calls: @@ -2619,7 +2640,7 @@ GameObject: - component: {fileID: 1947746357343340902} - component: {fileID: 7031816600200249011} m_Layer: 5 - m_Name: professional_1 + m_Name: professional_3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2642,9 +2663,9 @@ RectTransform: - {fileID: 8909590669536544924} m_Father: {fileID: 1416652598344052137} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 148, y: -48} m_SizeDelta: {x: 296, y: 96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3357482328958439239 @@ -2771,7 +2792,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1416652598344052137 RectTransform: m_ObjectHideFlags: 0 @@ -2870,7 +2891,7 @@ GameObject: - component: {fileID: 4386171521727135520} - component: {fileID: 6068983768154103059} m_Layer: 5 - m_Name: professional_2 + m_Name: professional_7 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2893,9 +2914,9 @@ RectTransform: - {fileID: 8091779263489480781} m_Father: {fileID: 7830628986027470164} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 148, y: -141.38} m_SizeDelta: {x: 296, y: 90.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6562714463762274712 @@ -4275,7 +4296,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c632a663a74e3fe45b6c207d9e32f869, type: 3} + m_Sprite: {fileID: 21300000, guid: 1e9fae8f370d7cb43bf89c6e795c84f4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4387,7 +4408,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "Ph\xE1p s\u01B0" + m_text: "Ti\xEAn th\xFA" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} m_sharedMaterial: {fileID: 9092487103257209053, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} @@ -4523,7 +4544,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 580a6d6ccb718fe449afc60ac07f453f, type: 3} + m_Sprite: {fileID: 21300000, guid: 1fc0aa13105d5df4b9d8ae0f80f71b9e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4818,7 +4839,7 @@ GameObject: - component: {fileID: 4302319052861411042} - component: {fileID: 43840615540252804} m_Layer: 5 - m_Name: professional_2 + m_Name: professional_4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4841,9 +4862,9 @@ RectTransform: - {fileID: 931743206068965756} m_Father: {fileID: 1416652598344052137} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 148, y: -141.38} m_SizeDelta: {x: 296, y: 90.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3322758831251649996 @@ -5362,9 +5383,9 @@ RectTransform: - {fileID: 1416652598344052137} m_Father: {fileID: 5444603765313937912} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 237.0925, y: -280.13998} m_SizeDelta: {x: 474.185, y: 186.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2860526708770294334 @@ -5484,9 +5505,9 @@ RectTransform: - {fileID: 5320464328943649663} m_Father: {fileID: 5444603765313937912} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 237.0925, y: -93.38} m_SizeDelta: {x: 474.185, y: 186.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &946827543569852510 @@ -5804,7 +5825,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2280847149185189015} toggleTransition: 1 graphic: {fileID: 692835898052317172} - m_Group: {fileID: 0} + m_Group: {fileID: 3011509526583693805} onValueChanged: m_PersistentCalls: m_Calls: @@ -5912,7 +5933,7 @@ GameObject: - component: {fileID: 5935099048852321795} - component: {fileID: 2762528079727481461} m_Layer: 5 - m_Name: professional_1 + m_Name: professional_6 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5935,9 +5956,9 @@ RectTransform: - {fileID: 3689509019052420792} m_Father: {fileID: 7830628986027470164} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 148, y: -48} m_SizeDelta: {x: 296, y: 96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4961401454361902623 @@ -6186,7 +6207,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "Ki\u1EBFm kh\xE1ch" + m_text: "V\u0169 mang" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} m_sharedMaterial: {fileID: 9092487103257209053, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} @@ -6322,7 +6343,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "Ph\xE1p s\u01B0" + m_text: "V\u0169 linh" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2} m_sharedMaterial: {fileID: 9092487103257209053, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2}