Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero

This commit is contained in:
changyuxiang 2025-10-07 20:09:03 +08:00
commit f04c3f44e9
52 changed files with 7 additions and 7 deletions

Binary file not shown.

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -55,8 +55,8 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
prefabList: prefabList:
- name: task_cell.reward_cell_1 - name: task_cell.reward_cell_3
hashName: 3527463186 hashName: 3527463188
objectType: 1 objectType: 1
gameObject: {fileID: 7639363876459055704} gameObject: {fileID: 7639363876459055704}
- name: task_cell.reward_cell_2 - name: task_cell.reward_cell_2
@ -67,8 +67,8 @@ MonoBehaviour:
hashName: 1849362787 hashName: 1849362787
objectType: 0 objectType: 0
gameObject: {fileID: 8559210398693621090} gameObject: {fileID: 8559210398693621090}
- name: task_cell.reward_cell_3 - name: task_cell.reward_cell_1
hashName: 3527463188 hashName: 3527463186
objectType: 1 objectType: 1
gameObject: {fileID: 6968821570592258671} gameObject: {fileID: 6968821570592258671}
- name: task_cell.bg - name: task_cell.bg
@ -411,7 +411,7 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
- target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: reward_cell_1 value: reward_cell_3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
@ -713,7 +713,7 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
- target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: reward_cell_3 value: reward_cell_1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6815037193996116278, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - target: {fileID: 6815037193996116278, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3}
propertyPath: m_Material propertyPath: m_Material