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-08-21 21:06:54 +08:00
parent 1b06feed2c
commit d30e9e502f
10 changed files with 25 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/lua/app/module/hero/hero_manager.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/arena/arena_ui.lua.bytes
View File

Binary file not shown.

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

Binary file not shown.

BIN
Assets/lua/app/ui/main_city/component/main_comp.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/hero/hero_entity.lua.bytes
View File

Binary file not shown.

240
Assets/prefabs/ui/hero/hero_detail_ui.prefab
View File

@ -823,7 +823,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3121552964615492639}
m_RootOrder: 13
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -7346,7 +7346,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3121552964615492639
RectTransform:
m_ObjectHideFlags: 0
@ -7369,8 +7369,6 @@ RectTransform:
- {fileID: 6378431467282090021}
- {fileID: 7180161233872738107}
- {fileID: 7087565110164569928}
- {fileID: 6629456022564667523}
- {fileID: 5264852851106824938}
- {fileID: 5637289209986445403}
- {fileID: 8115947417889667864}
m_Father: {fileID: 8461932745927490369}
@ -7478,14 +7476,6 @@ MonoBehaviour:
hashName: 3763395823
objectType: 0
gameObject: {fileID: 4017915383079728665}
- name: hero_info.ui_spine_obj_skill
hashName: 3023328381
objectType: 6
gameObject: {fileID: 6133285403699513403}
- name: hero_info.ui_spine_obj_lv
hashName: 2016318174
objectType: 6
gameObject: {fileID: 4615558990665828946}
- name: hero_info.ui_spine_obj
hashName: 1016898411
objectType: 6
@ -8286,115 +8276,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &4615558990665828946
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5264852851106824938}
- component: {fileID: 4879953812073206630}
- component: {fileID: 9105406457248990859}
m_Layer: 5
m_Name: ui_spine_obj_lv
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5264852851106824938
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4615558990665828946}
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: 3121552964615492639}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 28, y: -377}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4879953812073206630
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4615558990665828946}
m_CullTransparentMesh: 1
--- !u!114 &9105406457248990859
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4615558990665828946}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: f74478ee343fcee41a91bc8e1dd67ff3, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
skeletonDataAsset: {fileID: 11400000, guid: 9ea16fb9cf31b0d4d8e60fe12657fffd, type: 2}
additiveMaterial: {fileID: 0}
multiplyMaterial: {fileID: 0}
screenMaterial: {fileID: 0}
m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1}
initialSkinName:
initialFlipX: 0
initialFlipY: 0
startingAnimation: animation
startingLoop: 0
timeScale: 1
freeze: 0
layoutScaleMode: 0
referenceSize: {x: 0, y: 0}
pivotOffset: {x: 0, y: 0}
referenceScale: 1
layoutScale: 1
rectTransformSize: {x: 0, y: 0}
editReferenceRect: 0
updateWhenInvisible: 3
allowMultipleCanvasRenderers: 0
canvasRenderers: []
separatorSlotNames: []
enableSeparatorSlots: 0
separatorParts: []
updateSeparatorPartLocation: 1
updateSeparatorPartScale: 0
disableMeshAssignmentOnOverride: 1
physicsPositionInheritanceFactor: {x: 1, y: 1}
physicsRotationInheritanceFactor: 1
physicsMovementRelativeTo: {fileID: 0}
meshGenerator:
settings:
useClipping: 1
zSpacing: 0
tintBlack: 0
canvasGroupCompatible: 0
pmaVertexColors: 1
addNormals: 0
calculateTangents: 0
immutableTriangles: 0
updateTiming: 1
unscaledTime: 0
--- !u!1 &4750645058923793338
GameObject:
m_ObjectHideFlags: 0
@ -8796,11 +8677,11 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3121552964615492639}
m_RootOrder: 12
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -331}
m_AnchoredPosition: {x: 0, y: -404}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4941076948335026647
@ -9916,7 +9797,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1373839795370585509
RectTransform:
m_ObjectHideFlags: 0
@ -10767,115 +10648,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &6133285403699513403
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6629456022564667523}
- component: {fileID: 6244549596187037967}
- component: {fileID: 7731811984466347234}
m_Layer: 5
m_Name: ui_spine_obj_skill
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6629456022564667523
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6133285403699513403}
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: 3121552964615492639}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -640}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6244549596187037967
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6133285403699513403}
m_CullTransparentMesh: 1
--- !u!114 &7731811984466347234
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6133285403699513403}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: f74478ee343fcee41a91bc8e1dd67ff3, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
skeletonDataAsset: {fileID: 11400000, guid: 85932d00671ab9049aedb4e08d093608, type: 2}
additiveMaterial: {fileID: 0}
multiplyMaterial: {fileID: 0}
screenMaterial: {fileID: 0}
m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1}
initialSkinName:
initialFlipX: 0
initialFlipY: 0
startingAnimation:
startingLoop: 0
timeScale: 1
freeze: 0
layoutScaleMode: 0
referenceSize: {x: 0, y: 0}
pivotOffset: {x: 0, y: 0}
referenceScale: 1
layoutScale: 1
rectTransformSize: {x: 0, y: 0}
editReferenceRect: 0
updateWhenInvisible: 3
allowMultipleCanvasRenderers: 0
canvasRenderers: []
separatorSlotNames: []
enableSeparatorSlots: 0
separatorParts: []
updateSeparatorPartLocation: 1
updateSeparatorPartScale: 0
disableMeshAssignmentOnOverride: 1
physicsPositionInheritanceFactor: {x: 1, y: 1}
physicsRotationInheritanceFactor: 1
physicsMovementRelativeTo: {fileID: 0}
meshGenerator:
settings:
useClipping: 1
zSpacing: 0
tintBlack: 0
canvasGroupCompatible: 0
pmaVertexColors: 1
addNormals: 0
calculateTangents: 0
immutableTriangles: 0
updateTiming: 1
unscaledTime: 0
--- !u!1 &6133699563081421779
GameObject:
m_ObjectHideFlags: 0
@ -11473,7 +11245,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2584119948269024356
RectTransform:
m_ObjectHideFlags: 0

4
Assets/prefabs/ui/main_city/main_ui.prefab
View File

@ -5844,7 +5844,7 @@ PrefabInstance:
- target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
propertyPath: skeletonDataAsset
value:
objectReference: {fileID: 11400000, guid: 777f208010d4f4bd49ec1cf6335978db, type: 2}
objectReference: {fileID: 11400000, guid: 76dc93ac6411f38448913efd158ff63a, type: 2}
- target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@ -6070,7 +6070,7 @@ PrefabInstance:
- target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
propertyPath: skeletonDataAsset
value:
objectReference: {fileID: 11400000, guid: 513197592452c475a9acae1714fa2bb7, type: 2}
objectReference: {fileID: 11400000, guid: 4123c706459ceac4bb92565b3c22e98a, type: 2}
- target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
propertyPath: m_Pivot.x
value: 0.5

2
Assets/prefabs/ui/talent/cell/talent_cell.prefab
View File

@ -201,7 +201,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 617d7100d8b3146a8973efe525d3a335, type: 3}
m_Sprite: {fileID: 21300000, guid: 9d4060ca4d21c4c04a02c0c6b0c40e2e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

17
Assets/prefabs/ui/talent/talent_ui.prefab
View File

@ -560,7 +560,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5045946273449496793
RectTransform:
m_ObjectHideFlags: 0
@ -2193,6 +2193,21 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 4692731834399831388, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3}
m_PrefabInstance: {fileID: 5984717418218748626}
m_PrefabAsset: {fileID: 0}
--- !u!111 &5052471128262184700
Animation:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1302123539969920910}
m_Enabled: 1
serializedVersion: 3
m_Animation: {fileID: 7400000, guid: 882fa7cf16bdc4b43a619f3165359ef2, type: 2}
m_Animations: []
m_WrapMode: 0
m_PlayAutomatically: 1
m_AnimatePhysics: 0
m_CullingType: 0
--- !u!224 &7281719863256343853 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3}