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-10-22 17:33:37 +08:00
parent fc2bc97405
commit c26a8289be
17 changed files with 189 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/lua/app/common/sdk_manager.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/global/global_func.lua.bytes
View File

Binary file not shown.

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

Binary file not shown.

BIN
Assets/lua/app/module/task/task_manager.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/activity/act_seven_day/component/task_comp.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/battle/battle_base_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/battle/battle_skill_select_comp.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/idle/idle_drop_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/ui/summon/cell/summon_reward_cell.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/task/task_main_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/bag/item_entity.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/payment/payment_data.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/player/player_data.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/summon/summon_data.lua.bytes
View File

Binary file not shown.

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

@ -5294,7 +5294,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: 10, y: -66} m_AnchoredPosition: {x: 0, y: -45}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &8211635721378945233 --- !u!223 &8211635721378945233

222
Assets/prefabs/ui/tips/rewards_tips.prefab
View File

@ -113,7 +113,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: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 346, y: 226}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1435578269764350541 --- !u!222 &1435578269764350541
CanvasRenderer: CanvasRenderer:
@ -123,6 +123,158 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 959292791292240460} m_GameObject: {fileID: 959292791292240460}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1495508094237371152
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3743373069461783962}
- component: {fileID: 3400283517279875274}
- component: {fileID: 4990894626065891679}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3743373069461783962
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1495508094237371152}
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: 1352963236166380994}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 13}
m_SizeDelta: {x: 0, y: -26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3400283517279875274
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1495508094237371152}
m_CullTransparentMesh: 1
--- !u!114 &4990894626065891679
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1495508094237371152}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1600199366472240693
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5082540778538301611}
- component: {fileID: 7159593219274069473}
- component: {fileID: 2952236514363971047}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5082540778538301611
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1600199366472240693}
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: 1783650026181210100}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 13}
m_SizeDelta: {x: 0, y: -26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7159593219274069473
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1600199366472240693}
m_CullTransparentMesh: 1
--- !u!114 &2952236514363971047
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1600199366472240693}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2115658394927526756 --- !u!1 &2115658394927526756
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -153,6 +305,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 5082540778538301611}
- {fileID: 6081780833341448190} - {fileID: 6081780833341448190}
- {fileID: 5573229924703327939} - {fileID: 5573229924703327939}
- {fileID: 1443991657371655759} - {fileID: 1443991657371655759}
@ -162,8 +315,8 @@ 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: 0, y: 63} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 346, y: 200} m_SizeDelta: {x: 346, y: 226}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3991149810103026197 --- !u!222 &3991149810103026197
CanvasRenderer: CanvasRenderer:
@ -193,8 +346,8 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, 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
@ -233,6 +386,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 3743373069461783962}
- {fileID: 3475338422305338575} - {fileID: 3475338422305338575}
- {fileID: 3302698426571504846} - {fileID: 3302698426571504846}
- {fileID: 3797904215130719551} - {fileID: 3797904215130719551}
@ -242,8 +396,8 @@ 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: 0, y: 75} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 346, y: 200} m_SizeDelta: {x: 346, y: 226}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7376567826131227151 --- !u!222 &7376567826131227151
CanvasRenderer: CanvasRenderer:
@ -273,8 +427,8 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, 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
@ -314,11 +468,11 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1352963236166380994} m_Father: {fileID: 1352963236166380994}
m_RootOrder: 0 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 6} m_AnchoredPosition: {x: 0, y: 32}
m_SizeDelta: {x: 42, y: 26} m_SizeDelta: {x: 42, y: 26}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!222 &563715109830167051 --- !u!222 &563715109830167051
@ -390,12 +544,12 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1783650026181210100} m_Father: {fileID: 1783650026181210100}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -34} m_AnchoredPosition: {x: 0, y: 58}
m_SizeDelta: {x: 230, y: 18} m_SizeDelta: {x: -20, y: -136}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4355968031421668687 --- !u!222 &4355968031421668687
CanvasRenderer: CanvasRenderer:
@ -525,7 +679,7 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1783650026181210100} m_Father: {fileID: 1783650026181210100}
m_RootOrder: 2 m_RootOrder: 3
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}
@ -795,12 +949,12 @@ RectTransform:
- {fileID: 8970469402695251181} - {fileID: 8970469402695251181}
- {fileID: 8697205304515574201} - {fileID: 8697205304515574201}
m_Father: {fileID: 1783650026181210100} m_Father: {fileID: 1783650026181210100}
m_RootOrder: 3 m_RootOrder: 4
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: 0, y: -10} m_AnchoredPosition: {x: 0, y: -38}
m_SizeDelta: {x: 300, y: 130} m_SizeDelta: {x: 300, y: 80}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7298633522131123418 --- !u!114 &7298633522131123418
MonoBehaviour: MonoBehaviour:
@ -818,7 +972,7 @@ MonoBehaviour:
right: 0 right: 0
top: 0 top: 0
bottom: 0 bottom: 0
childAlignment: 4 childAlignment: 1
spacing: 10 spacing: 10
verticalOrHorizontal: 0 verticalOrHorizontal: 0
--- !u!1 &6651004402920351252 --- !u!1 &6651004402920351252
@ -852,12 +1006,12 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1352963236166380994} m_Father: {fileID: 1352963236166380994}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 40} m_AnchoredPosition: {x: 0, y: 46}
m_SizeDelta: {x: -20, y: -100} m_SizeDelta: {x: -20, y: -140}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4655218116066473719 --- !u!222 &4655218116066473719
CanvasRenderer: CanvasRenderer:
@ -987,11 +1141,11 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1352963236166380994} m_Father: {fileID: 1352963236166380994}
m_RootOrder: 2 m_RootOrder: 3
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: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -20} m_AnchoredPosition: {x: 0, y: -120}
m_SizeDelta: {x: 300, y: 3} m_SizeDelta: {x: 300, y: 3}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9080004469518254237 --- !u!222 &9080004469518254237
@ -1063,11 +1217,11 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1783650026181210100} m_Father: {fileID: 1783650026181210100}
m_RootOrder: 0 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -1.2999878, y: 4} m_AnchoredPosition: {x: 0, y: 30}
m_SizeDelta: {x: 42, y: 26} m_SizeDelta: {x: 42, y: 26}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!222 &3043515946675023079 --- !u!222 &3043515946675023079
@ -1143,11 +1297,11 @@ RectTransform:
- {fileID: 8930984911956618769} - {fileID: 8930984911956618769}
- {fileID: 4952275068775142670} - {fileID: 4952275068775142670}
m_Father: {fileID: 1352963236166380994} m_Father: {fileID: 1352963236166380994}
m_RootOrder: 3 m_RootOrder: 4
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: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -60} m_AnchoredPosition: {x: 0, y: -160}
m_SizeDelta: {x: 288, y: 70} m_SizeDelta: {x: 288, y: 70}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1537634711252562137 --- !u!222 &1537634711252562137