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

Merge branch 'dev_20230712' of http://git.juzugame.com/b6-client/b6-unity into dev_20230712

Browse Source 
# Conflicts:
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
This commit is contained in:
xiekaidong 2023-07-11 15:46:43 +08:00
commit 6576bb731b
10 changed files with 500 additions and 980 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/lua/app/module/item/item_const.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/module/tips/tips_manager.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/dungeon/dungeon_board_cell.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/dungeon/dungeon_difficulty_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/tips/hero_fragment_tips.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/dungeon/dungeon_base_entity.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/dungeon/dungeon_data.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/dungeon/dungeon_shards_entity.lua.bytes
View File

Binary file not shown.

1129
Assets/prefabs/ui/dungeon/dungeon_difficulty_ui.prefab
View File

File diff suppressed because it is too large Load Diff

351
Assets/prefabs/ui/main_city/main_comp.prefab
View File

@ -1723,81 +1723,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1298229747483906165
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7012285986369779439}
- component: {fileID: 4666212552751260031}
- component: {fileID: 3728337241545963155}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7012285986369779439
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1298229747483906165}
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_Children: []
m_Father: {fileID: 5564872588886712839}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 120, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4666212552751260031
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1298229747483906165}
m_CullTransparentMesh: 1
--- !u!114 &3728337241545963155
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1298229747483906165}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: ca105ffa7d9ffc347a89f665c9e3c5e5, type: 3}
m_Type: 0
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 &1311099006749624307
GameObject:
m_ObjectHideFlags: 0
@ -7838,7 +7763,7 @@ RectTransform:
- {fileID: 6896936442081879094}
- {fileID: 4078619141744132341}
- {fileID: 3526936379293538330}
- {fileID: 5564872588886712839}
- {fileID: 8194085700413129124}
- {fileID: 6515698856436361035}
- {fileID: 1840079313414210273}
- {fileID: 6726094116345838332}
@ -7907,14 +7832,6 @@ MonoBehaviour:
hashName: 3182612355
objectType: 0
gameObject: {fileID: 910854185636959459}
- name: dungeon_board_cell.item_reward.icon
hashName: 4251641626
objectType: 0
gameObject: {fileID: 1298229747483906165}
- name: dungeon_board_cell.item_reward
hashName: 1934897837
objectType: 0
gameObject: {fileID: 8168829659302803580}
- name: dungeon_board_cell.lock.desc.icon
hashName: 89936545
objectType: 0
@ -7923,6 +7840,10 @@ MonoBehaviour:
hashName: 1207093259
objectType: 0
gameObject: {fileID: 2081855255294860422}
- name: dungeon_board_cell.reward_cell
hashName: 3257369924
objectType: 1
gameObject: {fileID: 1093195492301415546}
--- !u!222 &4497120838661232689
CanvasRenderer:
m_ObjectHideFlags: 0
@ -8061,7 +7982,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4444211905114488189
RectTransform:
m_ObjectHideFlags: 0
@ -12263,109 +12184,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8168829659302803580
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5564872588886712839}
- component: {fileID: 361019199492607875}
- component: {fileID: 902330109428429359}
- component: {fileID: 422179150754558562}
- component: {fileID: 1730495268690993921}
m_Layer: 5
m_Name: item_reward
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5564872588886712839
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8168829659302803580}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.79999995, y: 0.79999995, z: 0.79999995}
m_Children:
- {fileID: 7012285986369779439}
m_Father: {fileID: 6082165752014517120}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 90, y: -232}
m_SizeDelta: {x: 120, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!225 &361019199492607875
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8168829659302803580}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!222 &902330109428429359
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8168829659302803580}
m_CullTransparentMesh: 1
--- !u!114 &422179150754558562
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8168829659302803580}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 899882c0d56e96d4caf5d82d2b469729, type: 3}
m_Type: 0
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!114 &1730495268690993921
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8168829659302803580}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
m_Name:
m_EditorClassIdentifier:
IsShowClickAnimation: 1
--- !u!1 &8196618017458989728
GameObject:
m_ObjectHideFlags: 0
@ -12420,7 +12238,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3627930560419446073
RectTransform:
m_ObjectHideFlags: 0
@ -14011,16 +13829,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
--- !u!224 &3178344294329280471 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 354835069707619401}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2254130738374009137 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 354835069707619401}
m_PrefabAsset: {fileID: 0}
--- !u!224 &3178344294329280471 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 354835069707619401}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3384319494706504071
PrefabInstance:
m_ObjectHideFlags: 0
@ -14122,16 +13940,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
--- !u!224 &432516470351448601 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 3384319494706504071}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3842524640567971071 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 3384319494706504071}
m_PrefabAsset: {fileID: 0}
--- !u!224 &432516470351448601 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 3384319494706504071}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3732174623407794182
PrefabInstance:
m_ObjectHideFlags: 0
@ -14233,16 +14051,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
--- !u!224 &1962521455536505752 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 3732174623407794182}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2913756806983878014 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 3732174623407794182}
m_PrefabAsset: {fileID: 0}
--- !u!224 &1962521455536505752 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 3732174623407794182}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4117931743722912774
PrefabInstance:
m_ObjectHideFlags: 0
@ -14468,6 +14286,121 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 5061460047304183613}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5913744635504226800
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6082165752014517120}
m_Modifications:
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_SizeDelta.x
value: 120
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_SizeDelta.y
value: 120
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_LocalScale.x
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_LocalScale.y
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_AnchoredPosition.x
value: 90
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_AnchoredPosition.y
value: -232
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_Name
value: reward_cell
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
--- !u!1 &1093195492301415546 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
m_PrefabInstance: {fileID: 5913744635504226800}
m_PrefabAsset: {fileID: 0}
--- !u!224 &8194085700413129124 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
m_PrefabInstance: {fileID: 5913744635504226800}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6554784824521001269
PrefabInstance:
m_ObjectHideFlags: 0
@ -14569,16 +14502,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
--- !u!224 &8214664435081863851 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 6554784824521001269}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4707283583799551053 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 6554784824521001269}
m_PrefabAsset: {fileID: 0}
--- !u!224 &8214664435081863851 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
m_PrefabInstance: {fileID: 6554784824521001269}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8269518788347194066
PrefabInstance:
m_ObjectHideFlags: 0