puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
puxuan 2025-11-05 17:26:35 +08:00
parent 02588a83fb
commit ac0c17307d
7 changed files with 29 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/lua/app/ui/company/company_comp.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/talent/talent_data.lua.bytes
View File

Binary file not shown.

6
Assets/prefabs/ui/battle/battle_ui_pvp.prefab
View File

@ -5872,7 +5872,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -61} m_AnchoredPosition: {x: 50, y: -61}
m_SizeDelta: {x: 58, y: 58} m_SizeDelta: {x: 52, y: 52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6341968543497613430 --- !u!222 &6341968543497613430
CanvasRenderer: CanvasRenderer:
@ -5902,7 +5902,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 111fa2e75dc3d47c0bad6dce4490f997, type: 3} m_Sprite: {fileID: 21300000, guid: f5403077419a44a43862ba0f8caa294c, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -6461,7 +6461,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &8530690046516819916 --- !u!224 &8530690046516819916
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

55
Assets/prefabs/ui/privilege/privilege_main_ui.prefab
View File

@ -698,7 +698,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: d57a263694e6143aabb4aef05cb75b07, type: 3} m_Sprite: {fileID: 21300000, guid: e75e6d1e8f0f64aab9d428c4e02012dd, type: 3}
m_Type: 1 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -985,7 +985,6 @@ GameObject:
- component: {fileID: 3391868558750570768} - component: {fileID: 3391868558750570768}
- component: {fileID: 8913262869834427279} - component: {fileID: 8913262869834427279}
- component: {fileID: 3978021245924370064} - component: {fileID: 3978021245924370064}
- component: {fileID: 6089723801264691633}
m_Layer: 5 m_Layer: 5
m_Name: desc_tx_3 m_Name: desc_tx_3
m_TagString: Untagged m_TagString: Untagged
@ -1110,28 +1109,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &6089723801264691633
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 624135235331427048}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3}
m_Name:
m_EditorClassIdentifier:
skeletonGraphic: {fileID: 1141145480138950802}
initializeOnAwake: 1
boneName: ziti1
followBoneRotation: 1
followSkeletonFlip: 1
followLocalScale: 0
followParentWorldScale: 0
followXYPosition: 1
followZPosition: 0
maintainedAxisOrientation: 1
--- !u!1 &799643576457094282 --- !u!1 &799643576457094282
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1407,7 +1384,7 @@ MonoBehaviour:
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 1 m_enableAutoSizing: 1
m_fontSizeMin: 20 m_fontSizeMin: 20
m_fontSizeMax: 26 m_fontSizeMax: 30
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 2 m_HorizontalAlignment: 2
m_VerticalAlignment: 512 m_VerticalAlignment: 512
@ -3005,7 +2982,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2277919921623431731} m_GameObject: {fileID: 2277919921623431731}
m_LocalRotation: {x: -0, y: -0, z: -0.0000000010402972, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -3015,7 +2992,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 196, y: -2} m_AnchoredPosition: {x: 198, y: 4}
m_SizeDelta: {x: 206, y: 159} m_SizeDelta: {x: 206, y: 159}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7180006117855696928 --- !u!222 &7180006117855696928
@ -4556,7 +4533,7 @@ MonoBehaviour:
m_text: m_text:
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 577ef78bdf3df8a48876ae4d53be9bff, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -6349,7 +6326,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4084534840337823112} m_GameObject: {fileID: 4084534840337823112}
m_LocalRotation: {x: -0, y: -0, z: -0.0000000010402972, w: 1} m_LocalRotation: {x: -0, y: -0, z: 0.0032291387, w: 0.9999948}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -6359,7 +6336,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 196, y: 14} m_AnchoredPosition: {x: 198, y: 24.025208}
m_SizeDelta: {x: 206, y: 159} m_SizeDelta: {x: 206, y: 159}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2816068483513759874 --- !u!222 &2816068483513759874
@ -11966,7 +11943,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 196, y: -137} m_AnchoredPosition: {x: 196, y: -137}
m_SizeDelta: {x: 190, y: 89} m_SizeDelta: {x: 156, y: 68}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6393879075785808688 --- !u!222 &6393879075785808688
CanvasRenderer: CanvasRenderer:
@ -11996,8 +11973,8 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3}
m_Type: 1 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4
@ -12223,7 +12200,7 @@ MonoBehaviour:
m_text: m_text:
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 577ef78bdf3df8a48876ae4d53be9bff, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -13246,6 +13223,10 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: ui_spine_obj value: ui_spine_obj
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
propertyPath: startingLoop
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
propertyPath: referenceSize.x propertyPath: referenceSize.x
value: 0 value: 0
@ -13257,6 +13238,10 @@ PrefabInstance:
- target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
propertyPath: skeletonDataAsset propertyPath: skeletonDataAsset
value: value:
objectReference: {fileID: 11400000, guid: c5e14d6b50de62a46952858f3086e4b8, type: 2}
- target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
propertyPath: startingAnimation
value: idle
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
@ -13506,7 +13491,7 @@ PrefabInstance:
- target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
propertyPath: skeletonDataAsset propertyPath: skeletonDataAsset
value: value:
objectReference: {fileID: 0} objectReference: {fileID: 11400000, guid: c5e14d6b50de62a46952858f3086e4b8, type: 2}
- target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
value: 0.5 value: 0.5

12
Assets/prefabs/ui/summon/summon_main_ui.prefab
View File

@ -4530,7 +4530,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3} m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
GroupOrder: 1 GroupOrder: 20
--- !u!1 &5362555893550286612 --- !u!1 &5362555893550286612
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5417,7 +5417,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3} m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
GroupOrder: 1 GroupOrder: 20
--- !u!1 &7775476082374568441 --- !u!1 &7775476082374568441
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6703,7 +6703,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 5401215128552085899, guid: 852486559026a424099082e43c98cc05, type: 3} - target: {fileID: 5401215128552085899, guid: 852486559026a424099082e43c98cc05, type: 3}
propertyPath: GroupOrder propertyPath: GroupOrder
value: 10 value: 21
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8234700346181588800, guid: 852486559026a424099082e43c98cc05, type: 3} - target: {fileID: 8234700346181588800, guid: 852486559026a424099082e43c98cc05, type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
@ -7526,7 +7526,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 3511156362688393964, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3} - target: {fileID: 3511156362688393964, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3}
propertyPath: GroupOrder propertyPath: GroupOrder
value: 10 value: 21
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7309059498324196270, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3} - target: {fileID: 7309059498324196270, guid: a29f71b84ff428c4ab19d55b276e5352, type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
@ -7774,7 +7774,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 3272391289621073328, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3} - target: {fileID: 3272391289621073328, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3}
propertyPath: GroupOrder propertyPath: GroupOrder
value: 10 value: 21
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6069280858182200166, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3} - target: {fileID: 6069280858182200166, guid: 57209e122ae81c447ab1e5eaf44b12c4, type: 3}
propertyPath: m_Name propertyPath: m_Name
@ -8398,7 +8398,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5417684721704444006, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3} - target: {fileID: 5417684721704444006, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3}
propertyPath: GroupOrder propertyPath: GroupOrder
value: 10 value: 21
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3} m_SourcePrefab: {fileID: 100100000, guid: c3aaa5aad8f7aa444ab83f6b7b80ddad, type: 3}