fatiao/ro-webgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: fatiao:597ee8264adde30e9dbe034f0ef30409a352ed8f
Branches Tags
fatiao:master
fatiao:game
fatiao:game-unitysdk
fatiao:game-google
fatiao:bblgl-c106
fatiao:csui
...
compare: fatiao:fa06e805043be637af05172d4ddad2033183968e
Branches Tags
fatiao:game
fatiao:game-unitysdk
fatiao:game-google
fatiao:bblgl-c106
fatiao:csui
fatiao:master

2 Commits
597ee8264a ... fa06e80504

Author SHA1 Message Date
fatiao
fa06e80504 UIBattleDeploy: 属性显示正常了 2025-04-16 13:22:29 +08:00
fatiao
febf58eada UIBattleDeply：property UI 2025-04-15 22:24:36 +08:00
9 changed files with 1664 additions and 898 deletions
Show Stats Expand all files Collapse all files

580
Assets/2DUI.unity
View File

@ -20095,27 +20095,62 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1166254662}
m_Modifications:
- target: {fileID: 644431724256365673, guid: 1340d4be9e551de48af3be5be2ad9c72,
- target: {fileID: 244557121606502821, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 644431724256365673, guid: 1340d4be9e551de48af3be5be2ad9c72,
- target: {fileID: 244557121606502821, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 644431724256365673, guid: 1340d4be9e551de48af3be5be2ad9c72,
- target: {fileID: 244557121606502821, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 644431724256365673, guid: 1340d4be9e551de48af3be5be2ad9c72,
- target: {fileID: 244557121606502821, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 244557121606502821, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 644431724256365673, guid: 1340d4be9e551de48af3be5be2ad9c72,
- target: {fileID: 244557121606502821, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 325279564010871977, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 325279564010871977, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 325279564010871977, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 325279564010871977, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 325279564010871977, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 325279564010871977, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
@ -20225,6 +20260,541 @@ PrefabInstance:
propertyPath: m_Name
value: UIBattleDeploy
objectReference: {fileID: 0}
- target: {fileID: 1221520603728682111, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1221520603728682111, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1221520603728682111, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1221520603728682111, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1221520603728682111, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1467002005940573692, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1467002005940573692, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1467002005940573692, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1467002005940573692, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1467002005940573692, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1467002005940573692, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1605471888605169672, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1605471888605169672, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1605471888605169672, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 432
objectReference: {fileID: 0}
- target: {fileID: 1605471888605169672, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1964792278284290227, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1964792278284290227, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1964792278284290227, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1964792278284290227, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1964792278284290227, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1964792278284290227, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2626850041996759555, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2626850041996759555, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2626850041996759555, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2626850041996759555, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2626850041996759555, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2626850041996759555, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3149564920286818207, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3149564920286818207, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3149564920286818207, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3149564920286818207, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3149564920286818207, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3149564920286818207, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3224502513749281706, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3224502513749281706, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3224502513749281706, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3224502513749281706, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3224502513749281706, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3224502513749281706, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3993827010545262945, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3993827010545262945, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3993827010545262945, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3993827010545262945, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3993827010545262945, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3993827010545262945, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4635941770300466069, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4635941770300466069, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4635941770300466069, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4635941770300466069, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4635941770300466069, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4635941770300466069, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5775421009678015668, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5775421009678015668, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5775421009678015668, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5775421009678015668, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5775421009678015668, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5775421009678015668, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5779437946582570258, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5779437946582570258, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5779437946582570258, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5779437946582570258, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5779437946582570258, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5779437946582570258, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5861291590266173194, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5861291590266173194, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5861291590266173194, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5861291590266173194, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5861291590266173194, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5998011320388961544, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5998011320388961544, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5998011320388961544, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5998011320388961544, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5998011320388961544, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5998011320388961544, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6440212140805980788, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6440212140805980788, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6440212140805980788, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6440212140805980788, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6440212140805980788, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6440212140805980788, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6745832126349681430, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6745832126349681430, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6745832126349681430, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6745832126349681430, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6745832126349681430, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6745832126349681430, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8018424436044459615, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8018424436044459615, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8018424436044459615, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8018424436044459615, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8018424436044459615, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8565164766840527171, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8565164766840527171, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8565164766840527171, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8565164766840527171, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8565164766840527171, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8565164766840527171, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8837880874662512608, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8837880874662512608, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8837880874662512608, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8837880874662512608, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8936653101775841991, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8936653101775841991, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8936653101775841991, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8936653101775841991, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8936653101775841991, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8936653101775841991, guid: 1340d4be9e551de48af3be5be2ad9c72,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

392
Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset
View File

File diff suppressed because one or more lines are too long

1017
Assets/Content/Prefabs/UI/UIBattle/UIBattleDeploy.prefab
View File

File diff suppressed because it is too large Load Diff

2
Assets/Lua/Logic/UserData.lua
View File

@ -400,7 +400,7 @@ function UserData:RefreshAddPointAttr()
-- delta = self:GetPointAttr(v) - lastPointAttrs[v]
delta = SDataUtil.Sub(self:GetPointAttr(v), lastPointAttrs[v])
end
heroData:SetBaseFirstAttr(v, SDataUtil.Add(heroData:GetBaseFirstAttr(v),delta))
lastPointAttrs[v] = self:GetPointAttr(v)
lastBaseAttrs[v] = heroData:GetBaseFirstAttr(v)

134
Assets/Lua/UI/UIBattle/UIBattleDeployCtr.lua
View File

@ -73,8 +73,140 @@ function UIBattleDeployCtr:GetLastBaseAttrs(heroId)
end
end
function UIBattleDeployCtr:GetRoleDataAttrPoints(id)
if id == 1 then
return ManagerContainer.DataMgr.UserData:GetRoleDataAttrPoints()
else
return ManagerContainer.DataMgr.PartnerData:GetRoleDataAttrPoints(id)
end
end
function UIBattleDeployCtr:GetAttrPlanePercent(val)
return (val - 1) * num1 - num2 * math.pow(val - 1, 2)
local percent = (val - 1) * num1 - num2 * math.pow(val - 1, 2)
return percent
end
local function GetBaseAttrsByType(baseAttrs, type)
if baseAttrs == nil then return 0 end
if baseAttrs[type] == nil then return 0 end
return SDataUtil.InvConvert(baseAttrs[type] or 0)
end
function UIBattleDeployCtr:CalcMaxAttr(heroId, maxAttrType)
local totalPoint = CommonUtil.ToNumber(self:CalcTotalPoint(heroId))
local baseAttrs = self:GetLastBaseAttrs(heroId)
local oneAttrAddDic = {}
for i = Enum.HeroAttrType.STR, Enum.HeroAttrType.LUK do
if oneAttrAddDic[i] == nil then
oneAttrAddDic[i] = 1
end
end
local maxAttrPoint = 0
while true do
local cost = 0
if maxAttrType == Enum.HeroAttrType.STR then
cost = ManagerContainer.CfgMgr:GetHeroQualityPointByLv(GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.STR)+ maxAttrPoint).cost or ManagerContainer.CfgMgr:GetHeroQualityPointByLv(SDataUtil.InvConvert(baseAttrs[Enum.HeroAttrType.STR])+ maxAttrPoint - 1).cost
elseif maxAttrType == Enum.HeroAttrType.AGI then
cost = ManagerContainer.CfgMgr:GetHeroQualityPointByLv(GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.AGI) + maxAttrPoint).cost or ManagerContainer.CfgMgr:GetHeroQualityPointByLv(SDataUtil.InvConvert(baseAttrs[Enum.HeroAttrType.AGI]) + maxAttrPoint - 1).cost
elseif maxAttrType == Enum.HeroAttrType.INT then
cost = ManagerContainer.CfgMgr:GetHeroQualityPointByLv(GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.INT)+ maxAttrPoint).cost or ManagerContainer.CfgMgr:GetHeroQualityPointByLv(SDataUtil.InvConvert(baseAttrs[Enum.HeroAttrType.INT])+ maxAttrPoint - 1).cost
elseif maxAttrType == Enum.HeroAttrType.VIT then
cost = ManagerContainer.CfgMgr:GetHeroQualityPointByLv(GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.VIT)+ maxAttrPoint).cost or ManagerContainer.CfgMgr:GetHeroQualityPointByLv(SDataUtil.InvConvert(baseAttrs[Enum.HeroAttrType.VIT])+ maxAttrPoint - 1).cost
elseif maxAttrType == Enum.HeroAttrType.DEX then
cost = ManagerContainer.CfgMgr:GetHeroQualityPointByLv(GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.DEX)+ maxAttrPoint).cost or ManagerContainer.CfgMgr:GetHeroQualityPointByLv(SDataUtil.InvConvert(baseAttrs[Enum.HeroAttrType.DEX])+ maxAttrPoint - 1).cost
elseif maxAttrType == Enum.HeroAttrType.LUK then
cost = ManagerContainer.CfgMgr:GetHeroQualityPointByLv(GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.LUK)+ maxAttrPoint).cost or ManagerContainer.CfgMgr:GetHeroQualityPointByLv(SDataUtil.InvConvert(baseAttrs[Enum.HeroAttrType.LUK])+ maxAttrPoint - 1).cost
end
if totalPoint - cost < 0 then
break
end
totalPoint = totalPoint - cost
maxAttrPoint = maxAttrPoint + 1
end
return maxAttrPoint
end
function UIBattleDeployCtr:ChangeRemainPoint(heroId, num)
local remainPoints = self:GetRoleDataAttrPoints(heroId)
remainPoints = SDataUtil.Add(remainPoints, num)
return remainPoints
end
function UIBattleDeployCtr:GetRemainPoint(heroId)
return self:GetRoleDataAttrPoints(heroId)
end
local function Attr2Points(totalCount, attr, pointData)
if attr > 1 then
attr = attr - 1
totalCount = SDataUtil.Add(totalCount,pointData[attr].cost)
-- totalCount = totalCount + pointData[attr].cost
else
return totalCount
end
return Attr2Points(totalCount, attr, pointData)
end
function UIBattleDeployCtr:CalcTotalPoint(heroId)
local userData = self:GetHeroLogicData(heroId)
local baseAttrs = self:GetLastBaseAttrs(heroId)
local autoData
if isLeader then
local jobData = ManagerContainer.CfgMgr:GetJobDataById(userData.configId)
autoData = jobData.AutoAddPoint
else
local partnerData = ManagerContainer.CfgMgr:GetPartnerDataById(userData.configId)
autoData = partnerData.AddPoint
end
local pointData = ManagerContainer.CfgMgr.QualityPointCfg
local str = SDataUtil.InvConvert(baseAttrs[Enum.HeroAttrType.STR])
local agi = SDataUtil.InvConvert(baseAttrs[Enum.HeroAttrType.AGI])
local int = SDataUtil.InvConvert(baseAttrs[Enum.HeroAttrType.INT])
local vit = SDataUtil.InvConvert(baseAttrs[Enum.HeroAttrType.VIT])
local dex = SDataUtil.InvConvert(baseAttrs[Enum.HeroAttrType.DEX])
local luk = SDataUtil.InvConvert(baseAttrs[Enum.HeroAttrType.LUK])
local totalCount = self:GetRoleDataAttrPoints(heroId)
remainPoints = totalCount
local oldTotalCount = 0
local curTotalCountMap = {}
for _,v in pairs(autoData) do
local type = v[1]
local curTotalCount = 0
if type == Enum.HeroAttrType.STR then
curTotalCount = Attr2Points(curTotalCount, str, pointData)
elseif type == Enum.HeroAttrType.AGI then
curTotalCount = Attr2Points(curTotalCount, agi, pointData)
elseif type == Enum.HeroAttrType.INT then
curTotalCount = Attr2Points(curTotalCount, int, pointData)
elseif type == Enum.HeroAttrType.VIT then
curTotalCount = Attr2Points(curTotalCount, vit, pointData)
elseif type == Enum.HeroAttrType.DEX then
curTotalCount = Attr2Points(curTotalCount, dex, pointData)
elseif type == Enum.HeroAttrType.LUK then
curTotalCount = Attr2Points(curTotalCount, luk, pointData)
end
curTotalCountMap[type] = curTotalCount
oldTotalCount = SDataUtil.Add(oldTotalCount, curTotalCount)
end
local oneAttrAddDic = {}
local totalStatus = {}
local function NeedOver()
for k, v in pairs(totalStatus) do
if v then
return false
end
end
return true
end
local newTotalCount = SDataUtil.Add(oldTotalCount, totalCount)
return newTotalCount
end
return UIBattleDeployCtr

277
Assets/Lua/UI/UIBattle/UIBattleDeployView.lua
View File

@ -15,7 +15,7 @@ local LabelToggleType = {
DEX = 5,
LUK = 6,
HEX = 7,
Recomend = 8,
Current = 8,
More = 9
}
local HeadToggleType = {
@ -25,6 +25,12 @@ local HeadToggleType = {
Head4 = 4
}
local function GetBaseAttrsByType(baseAttrs, type)
if baseAttrs == nil then return 0 end
if baseAttrs[type] == nil then return 0 end
return SDataUtil.InvConvert(baseAttrs[type] or 0)
end
function UIBattleDeployView:OnAwake(data)
self.controller = require("UIBattle/UIBattleDeployCtr"):new()
self.controller:Init(self)
@ -55,10 +61,10 @@ function UIBattleDeployView:Init()
})
self.tabToggleList = {
[1] = self.propertyToggle,
[2] = self.Skill1Toggle,
[3] = self.Skill2Toggle,
[4] = self.Skill3Toggle,
[5] = self.Skill4Toggle,
[2] = self.skill1Toggle,
[3] = self.skill2Toggle,
[4] = self.skill3Toggle,
[5] = self.skill4Toggle,
}
self.tabList = {
[1] = self.tab1,
@ -98,8 +104,7 @@ function UIBattleDeployView:AddUIEventListener()
self.uiBase:AddToggleEventListener(self.maxIntLabelToggle.toggle, self, self.OnValueChanged_LabelToggleGroup, LabelToggleType.INT)
self.uiBase:AddToggleEventListener(self.maxDexLabelToggle.toggle, self, self.OnValueChanged_LabelToggleGroup, LabelToggleType.DEX)
self.uiBase:AddToggleEventListener(self.maxLukLabelToggle.toggle, self, self.OnValueChanged_LabelToggleGroup, LabelToggleType.LUK)
self.uiBase:AddToggleEventListener(self.hexLabelToggle.toggle, self, self.OnValueChanged_LabelToggleGroup, LabelToggleType.HEX)
self.uiBase:AddToggleEventListener(self.recommendLabelToggle.toggle, self, self.OnValueChanged_LabelToggleGroup, LabelToggleType.Recomend)
self.uiBase:AddToggleEventListener(self.currentLabelToggle.toggle, self, self.OnValueChanged_LabelToggleGroup, LabelToggleType.Current)
self.uiBase:AddToggleEventListener(self.moreLabelToggle.toggle, self, self.OnValueChanged_LabelToggleGroup, LabelToggleType.More)
end
@ -150,6 +155,88 @@ end
function UIBattleDeployView:OnValueChanged_LabelToggleGroup(toggle, toggleType, isOn)
--LogError("TAG: "..toggle.name..", LabelToggleGroup "..toggleType..", isOn "..tostring(isOn))
if isOn == false then return end
local curr_ActorData = self:GetCurrSelected_ActorData()
local heroId = CommonUtil.ToNumber(curr_ActorData.ID)
if toggleType == LabelToggleType.STR then
local maxAttr = CommonUtil.ToNumber(self.controller:CalcMaxAttr(heroId, Enum.HeroAttrType.STR))
local oneAttrAddDic = {}
for i = Enum.HeroAttrType.STR, Enum.HeroAttrType.LUK do
if oneAttrAddDic[i] == nil then
oneAttrAddDic[i] = 0
end
end
oneAttrAddDic[Enum.HeroAttrType.STR] = maxAttr
self:RefreshPropertyTab(heroId, oneAttrAddDic)
elseif toggleType == LabelToggleType.AGI then
local maxAttr = CommonUtil.ToNumber(self.controller:CalcMaxAttr(heroId, Enum.HeroAttrType.AGI))
local oneAttrAddDic = {}
for i = Enum.HeroAttrType.STR, Enum.HeroAttrType.LUK do
if oneAttrAddDic[i] == nil then
oneAttrAddDic[i] = 0
end
end
oneAttrAddDic[Enum.HeroAttrType.AGI] = maxAttr
self:RefreshPropertyTab(heroId, oneAttrAddDic)
elseif toggleType == LabelToggleType.VIT then
local maxAttr = CommonUtil.ToNumber(self.controller:CalcMaxAttr(heroId, Enum.HeroAttrType.VIT))
local oneAttrAddDic = {}
for i = Enum.HeroAttrType.STR, Enum.HeroAttrType.LUK do
if oneAttrAddDic[i] == nil then
oneAttrAddDic[i] = 0
end
end
oneAttrAddDic[Enum.HeroAttrType.VIT] = maxAttr
self:RefreshPropertyTab(heroId, oneAttrAddDic)
elseif toggleType == LabelToggleType.INT then
local maxAttr = CommonUtil.ToNumber(self.controller:CalcMaxAttr(heroId, Enum.HeroAttrType.INT))
local oneAttrAddDic = {}
for i = Enum.HeroAttrType.STR, Enum.HeroAttrType.LUK do
if oneAttrAddDic[i] == nil then
oneAttrAddDic[i] = 0
end
end
oneAttrAddDic[Enum.HeroAttrType.INT] = maxAttr
self:RefreshPropertyTab(heroId, oneAttrAddDic)
elseif toggleType == LabelToggleType.DEX then
local maxAttr = CommonUtil.ToNumber(self.controller:CalcMaxAttr(heroId, Enum.HeroAttrType.DEX))
local oneAttrAddDic = {}
for i = Enum.HeroAttrType.STR, Enum.HeroAttrType.LUK do
if oneAttrAddDic[i] == nil then
oneAttrAddDic[i] = 0
end
end
oneAttrAddDic[Enum.HeroAttrType.DEX] = maxAttr
self:RefreshPropertyTab(heroId, oneAttrAddDic)
elseif toggleType == LabelToggleType.LUK then
local maxAttr = CommonUtil.ToNumber(self.controller:CalcMaxAttr(heroId, Enum.HeroAttrType.LUK))
local oneAttrAddDic = {}
for i = Enum.HeroAttrType.STR, Enum.HeroAttrType.LUK do
if oneAttrAddDic[i] == nil then
oneAttrAddDic[i] = 0
end
end
oneAttrAddDic[Enum.HeroAttrType.LUK] = maxAttr
self:RefreshPropertyTab(heroId, oneAttrAddDic)
elseif toggleType == LabelToggleType.Current then
local heroData = self.controller:GetHeroLogicData(heroId)
local oneAttrAddDic = {}
for i = Enum.HeroAttrType.STR, Enum.HeroAttrType.LUK do
if oneAttrAddDic[i] == nil then
oneAttrAddDic[i] = CommonUtil.ToNumber(heroData.attrs[i])
end
end
self:RefreshPropertyTab(heroId, oneAttrAddDic)
elseif toggleType == LabelToggleType.More then
end
end
function UIBattleDeployView:GetCurrSelectedInfo()
@ -205,91 +292,39 @@ end
--[[
currSelectedInfo: {id = HeadToggleType.Head1, isSelected_Bool = true, tabSelectedIdx_Int = 1}
]]
local function GetBaseAttrsByType(baseAttrs, type)
if baseAttrs == nil then return 0 end
if baseAttrs[type] == nil then return 0 end
return SDataUtil.InvConvert(baseAttrs[type] or 0)
end
function UIBattleDeployView:RefreshHeroPad(data_ActorData, currSelectedInfo)
for i = 1, #self.tabToggleList do
local tabToggle = self.tabToggleList[i]
tabToggle.toggle.isOn = (i==currSelectedInfo.tabSelectedIdx_Int)
end
local heroId = CommonUtil.ToNumber(data_ActorData.ID)
local skillData = ManagerContainer.DataMgr.UserData:GetSkillData(heroId)
for i = 2, #self.tabToggleList do
local tabToggle = self.tabToggleList[i]
local textMeshPro = tabToggle.transform:Find("Text"):GetComponent(Enum.TypeInfo.TextMeshProUGUI)
local skillSlot = i - 1
local slotSkillId = skillData:GetSlotSkillId(skillSlot)
if slotSkillId > 0 then
local skillCfgData = ManagerContainer.CfgMgr:GetSkillCfgById(slotSkillId)
textMeshPro.text = I18N.SetLanguageValue(skillCfgData.Name)
else
textMeshPro.text = "..."
end
end
for i = 1, #self.tabList do
local tab = self.tabList[i]
tab:SetActive(i==currSelectedInfo.tabSelectedIdx_Int)
end
if currSelectedInfo.tabSelectedIdx_Int == TabToggleType.Property then
local heroId = CommonUtil.ToNumber(data_ActorData.ID)
local heroData = self.controller:GetHeroLogicData(heroId)
self.strStart.transform.localPosition = self:RefreshAttrPlanePercentVec(heroData.attrs[Enum.HeroAttrType.STR], self.strEnd.transform.localPosition)
self.agiStart.transform.localPosition = self:RefreshAttrPlanePercentVec(heroData.attrs[Enum.HeroAttrType.AGI], self.agiEnd.transform.localPosition)
self.intStart.transform.localPosition = self:RefreshAttrPlanePercentVec(heroData.attrs[Enum.HeroAttrType.INT], self.intEnd.transform.localPosition)
self.vitStart.transform.localPosition = self:RefreshAttrPlanePercentVec(heroData.attrs[Enum.HeroAttrType.VIT], self.vitEnd.transform.localPosition)
self.dexStart.transform.localPosition = self:RefreshAttrPlanePercentVec(heroData.attrs[Enum.HeroAttrType.DEX], self.dexEnd.transform.localPosition)
self.lukStart.transform.localPosition = self:RefreshAttrPlanePercentVec(heroData.attrs[Enum.HeroAttrType.LUK], self.lukEnd.transform.localPosition)
self.attr_plane.cUIPolygon:RefreshPolygonVertexs()
local oneAttrAddDic = {}
local twoAttrAddDic = {}
local baseAttrs = self.controller:GetLastBaseAttrs(heroId)
for i = Enum.HeroAttrType.STR, Enum.HeroAttrType.LUK do
if oneAttrAddDic[i] == nil then
oneAttrAddDic[i] = 0
oneAttrAddDic[i] = CommonUtil.ToNumber(heroData.attrs[i])
end
end
local dic = ManagerContainer.LuaActorDataMgr:GetRoleIncreaseSecondAttrVal(heroId,
oneAttrAddDic[Enum.HeroAttrType.STR] + GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.STR),
oneAttrAddDic[Enum.HeroAttrType.AGI] + GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.AGI),
oneAttrAddDic[Enum.HeroAttrType.INT] + GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.INT),
oneAttrAddDic[Enum.HeroAttrType.VIT] + GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.VIT),
oneAttrAddDic[Enum.HeroAttrType.DEX] + GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.DEX),
oneAttrAddDic[Enum.HeroAttrType.LUK] + GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.LUK)
)
local iter = dic:GetEnumerator()
while iter:MoveNext() do
-- LogError("Add "..tostring(iter.Current.Value))
local newAttrs = heroData.attrs
-- LogError(Inspect(newAttrs))
--服务器整数增量 = 取下整（当前本地增量 + 服务器当前 ）- 取下整（服务器当前）
if newAttrs[iter.Current.Key] ~= nil then
local SfServerAdd = SDataUtil.Add(newAttrs[iter.Current.Key] , iter.Current.Value)
local ServerAdd = SDataUtil.InvConvertDouble(SfServerAdd)
local CurServer = SDataUtil.InvConvertDouble(newAttrs[iter.Current.Key] )
twoAttrAddDic[iter.Current.Key] = math.floor(ServerAdd) - math.floor(CurServer)
else
twoAttrAddDic[iter.Current.Key] = math.floor(iter.Current.Value)
end
end
self.baseList = {}
local addList = {}
for k,v in pairs(heroData.attrs) do
if (k >= Enum.HeroAttrType.Life and k <= Enum.HeroAttrType.CastAcceleration) then
self.baseList[#self.baseList + 1] = {k, v, twoAttrAddDic[k] or 0}
else
if #heroData.attrs > 0 then
if k >= Enum.HeroAttrType.RealHurt then
if SDataUtil.InvConvertDouble(v) > 0 then
addList[#addList + 1] = {k, v, twoAttrAddDic[k] or 0}
end
end
end
end
end
if self.baseSView.loopVerticalScrollRect.totalCount ~= #self.baseList then
self.baseSView.loopVerticalScrollRect:ClearCells()
CommonUtil.LoopGridViewEleCreateNew(self, self.baseSView.loopVerticalScrollRect, self.baseSView.attrContent2.gridLayoutGroup, self.baseList, 0, nil, function (itemLua, idx)
CommonUtil.UpdateItemPrefab(self, itemLua, self.baseList[idx + 1])
end)
else
self.baseSView.loopVerticalScrollRect:ResetItemTypeStart()
self.baseSView.loopVerticalScrollRect:RefreshCellsData()
end
self.attrContent.rectTransform.anchoredPosition = Vector2(0, 0)
self:RefreshPropertyTab(heroId, oneAttrAddDic)
elseif currSelectedInfo.tabSelectedIdx_Int == TabToggleType.Skill1 then
elseif currSelectedInfo.tabSelectedIdx_Int == TabToggleType.Skill2 then
@ -298,9 +333,97 @@ function UIBattleDeployView:RefreshHeroPad(data_ActorData, currSelectedInfo)
end
end
function UIBattleDeployView:RefreshPropertyTab(heroId, oneAttrAddDic)
local heroData = self.controller:GetHeroLogicData(heroId)
if oneAttrAddDic == nil or CommonUtil.GetTableCount(oneAttrAddDic) == 0 then
oneAttrAddDic = {}
for i = Enum.HeroAttrType.STR, Enum.HeroAttrType.LUK do
if oneAttrAddDic[i] == nil then
oneAttrAddDic[i] = 0
end
end
end
for k,v in pairs(oneAttrAddDic) do
if k == Enum.HeroAttrType.STR then
self.strStart.transform.localPosition = self:RefreshAttrPlanePercentVec(v, self.strEnd.transform.localPosition)
elseif k == Enum.HeroAttrType.AGI then
self.agiStart.transform.localPosition = self:RefreshAttrPlanePercentVec(v, self.agiEnd.transform.localPosition)
elseif k == Enum.HeroAttrType.INT then
self.intStart.transform.localPosition = self:RefreshAttrPlanePercentVec(v, self.intEnd.transform.localPosition)
elseif k == Enum.HeroAttrType.VIT then
self.vitStart.transform.localPosition = self:RefreshAttrPlanePercentVec(v, self.vitEnd.transform.localPosition)
elseif k == Enum.HeroAttrType.DEX then
self.dexStart.transform.localPosition = self:RefreshAttrPlanePercentVec(v, self.dexEnd.transform.localPosition)
elseif k == Enum.HeroAttrType.LUK then
self.lukStart.transform.localPosition = self:RefreshAttrPlanePercentVec(v, self.lukEnd.transform.localPosition)
end
end
self.attr_plane.cUIPolygon:RefreshPolygonVertexs()
local baseAttrs = self.controller:GetLastBaseAttrs(heroId)
local dic = ManagerContainer.LuaActorDataMgr:GetRoleIncreaseSecondAttrVal(heroId,
oneAttrAddDic[Enum.HeroAttrType.STR] + GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.STR),
oneAttrAddDic[Enum.HeroAttrType.AGI] + GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.AGI),
oneAttrAddDic[Enum.HeroAttrType.INT] + GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.INT),
oneAttrAddDic[Enum.HeroAttrType.VIT] + GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.VIT),
oneAttrAddDic[Enum.HeroAttrType.DEX] + GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.DEX),
oneAttrAddDic[Enum.HeroAttrType.LUK] + GetBaseAttrsByType(baseAttrs, Enum.HeroAttrType.LUK)
)
local twoAttrAddDic = {}
local iter = dic:GetEnumerator()
while iter:MoveNext() do
--LogError("Add "..tostring(iter.Current.Value))
local newAttrs = heroData.attrs
-- LogError(Inspect(newAttrs))
--服务器整数增量 = 取下整（当前本地增量 + 服务器当前 ）- 取下整（服务器当前）
if newAttrs[iter.Current.Key] ~= nil then
local SfServerAdd = SDataUtil.Add(newAttrs[iter.Current.Key] , iter.Current.Value)
local ServerAdd = SDataUtil.InvConvertDouble(SfServerAdd)
local CurServer = SDataUtil.InvConvertDouble(newAttrs[iter.Current.Key] )
twoAttrAddDic[iter.Current.Key] = math.floor(ServerAdd) - math.floor(CurServer)
else
twoAttrAddDic[iter.Current.Key] = math.floor(iter.Current.Value)
end
end
self.baseList = {}
local addList = {}
for k,v in pairs(heroData.attrs) do
if (k >= Enum.HeroAttrType.Life and k <= Enum.HeroAttrType.CastAcceleration) then
self.baseList[#self.baseList + 1] = {k, v, twoAttrAddDic[k] or 0}
else
if #heroData.attrs > 0 then
if k >= Enum.HeroAttrType.RealHurt then
if SDataUtil.InvConvertDouble(v) > 0 then
addList[#addList + 1] = {k, v, twoAttrAddDic[k] or 0}
end
end
end
end
end
if self.baseSView.loopVerticalScrollRect.totalCount ~= #self.baseList then
self.baseSView.loopVerticalScrollRect:ClearCells()
CommonUtil.LoopGridViewEleCreateNew(self, self.baseSView.loopVerticalScrollRect, self.baseSView.attrContent2.gridLayoutGroup, self.baseList, 0, nil, function (itemLua, idx)
CommonUtil.UpdateItemPrefab(self, itemLua, self.baseList[idx + 1])
end)
else
self.baseSView.loopVerticalScrollRect:ResetItemTypeStart()
self.baseSView.loopVerticalScrollRect:RefreshCellsData()
end
self.attrContent.rectTransform.anchoredPosition = Vector2(0, 0)
end
---------------------------------------- Helper Function ----------------------------------------
function UIBattleDeployView:RefreshPropertyTab(data_ActorData)
function UIBattleDeployView:GetCurrSelected_ActorData()
local currSelectedInfo = self:GetCurrSelectedInfo()
if self.ourMembers_ActorData_List == nil then
local data_ActorData_List = LuaBattleBridge.GetBattleTeamPlayerActors()
self.ourMembers_ActorData_List = self.controller:GetSort_ActorData_List(data_ActorData_List)
end
local currSelected_ActorData = self.ourMembers_ActorData_List[currSelectedInfo.id]
return currSelected_ActorData
end
function UIBattleDeployView:RefreshHeroHead(head_GameObject, data_ActorData, isSelected_Bool)

158
Assets/Lua/UI/UIBattle/UIBattleDeployView_Generate.lua
View File

@ -76,14 +76,6 @@
---@field public gameObject UnityEngine.GameObject
---@field public toggle UnityEngine.UI.Toggle
---@class UIBattleDeploy__Generate_recommendLabelToggle
---@field public gameObject UnityEngine.GameObject
---@field public toggle UnityEngine.UI.Toggle
---@class UIBattleDeploy__Generate_hexLabelToggle
---@field public gameObject UnityEngine.GameObject
---@field public toggle UnityEngine.UI.Toggle
---@class UIBattleDeploy__Generate_maxLukLabelToggle
---@field public gameObject UnityEngine.GameObject
---@field public toggle UnityEngine.UI.Toggle
@ -108,6 +100,10 @@
---@field public gameObject UnityEngine.GameObject
---@field public toggle UnityEngine.UI.Toggle
---@class UIBattleDeploy__Generate_currentLabelToggle
---@field public gameObject UnityEngine.GameObject
---@field public toggle UnityEngine.UI.Toggle
---@class UIBattleDeploy__Generate_labelToggleGroup
---@field public gameObject UnityEngine.GameObject
---@field public toggleGroup UnityEngine.UI.ToggleGroup
@ -124,14 +120,13 @@
---@field private tab UnityEngine.GameObject
---@field private tab1 UnityEngine.GameObject
---@field private labelToggleGroup UIBattleDeploy__Generate_labelToggleGroup
---@field private currentLabelToggle UIBattleDeploy__Generate_currentLabelToggle
---@field private maxStrLabelToggle UIBattleDeploy__Generate_maxStrLabelToggle
---@field private maxAgiLabelToggle UIBattleDeploy__Generate_maxAgiLabelToggle
---@field private maxVitLabelToggle UIBattleDeploy__Generate_maxVitLabelToggle
---@field private maxIntLabelToggle UIBattleDeploy__Generate_maxIntLabelToggle
---@field private maxDexLabelToggle UIBattleDeploy__Generate_maxDexLabelToggle
---@field private maxLukLabelToggle UIBattleDeploy__Generate_maxLukLabelToggle
---@field private hexLabelToggle UIBattleDeploy__Generate_hexLabelToggle
---@field private recommendLabelToggle UIBattleDeploy__Generate_recommendLabelToggle
---@field private moreLabelToggle UIBattleDeploy__Generate_moreLabelToggle
---@field private strStart UnityEngine.GameObject
---@field private agiStart UnityEngine.GameObject
@ -237,7 +232,6 @@ function UIBattleDeployView:InitGenerate(Root, data)
self:InitGenerate__48(Root,data)
self:InitGenerate__49(Root,data)
self:InitGenerate__50(Root,data)
self:InitGenerate__51(Root,data)
end
@ -316,6 +310,20 @@ end
---@private
function UIBattleDeployView:InitGenerate__7(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/CurrentLabelToggle
--]]
local tmp = Root:Find("Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/CurrentLabelToggle").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.currentLabelToggle = tmp
tmp.toggle = tmp:GetComponent(Enum.TypeInfo.Toggle)
end
---@private
function UIBattleDeployView:InitGenerate__8(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/MaxStrLabelToggle
--]]
@ -329,7 +337,7 @@ function UIBattleDeployView:InitGenerate__7(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__8(Root, data)
function UIBattleDeployView:InitGenerate__9(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/MaxAgiLabelToggle
--]]
@ -343,7 +351,7 @@ function UIBattleDeployView:InitGenerate__8(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__9(Root, data)
function UIBattleDeployView:InitGenerate__10(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/MaxVitLabelToggle
--]]
@ -357,7 +365,7 @@ function UIBattleDeployView:InitGenerate__9(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__10(Root, data)
function UIBattleDeployView:InitGenerate__11(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/MaxIntLabelToggle
--]]
@ -365,14 +373,13 @@ function UIBattleDeployView:InitGenerate__10(Root, data)
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.maxIntLabelToggle = CommonUtil.BindGridViewItem2LuaStatic("SkillTagItem", tmp)
self.maxIntLabelToggle.prefabName = "SkillTagItem"
self.maxIntLabelToggle = tmp
tmp.toggle = tmp:GetComponent(Enum.TypeInfo.Toggle)
end
---@private
function UIBattleDeployView:InitGenerate__11(Root, data)
function UIBattleDeployView:InitGenerate__12(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/MaxDexLabelToggle
--]]
@ -386,7 +393,7 @@ function UIBattleDeployView:InitGenerate__11(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__12(Root, data)
function UIBattleDeployView:InitGenerate__13(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/MaxLukLabelToggle
--]]
@ -399,36 +406,8 @@ function UIBattleDeployView:InitGenerate__12(Root, data)
tmp.toggle = tmp:GetComponent(Enum.TypeInfo.Toggle)
end
---@private
function UIBattleDeployView:InitGenerate__13(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/HexLabelToggle
--]]
local tmp = Root:Find("Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/HexLabelToggle").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.hexLabelToggle = tmp
tmp.toggle = tmp:GetComponent(Enum.TypeInfo.Toggle)
end
---@private
function UIBattleDeployView:InitGenerate__14(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/RecommendLabelToggle
--]]
local tmp = Root:Find("Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/RecommendLabelToggle").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.recommendLabelToggle = tmp
tmp.toggle = tmp:GetComponent(Enum.TypeInfo.Toggle)
end
---@private
function UIBattleDeployView:InitGenerate__15(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/LabelToggleGroup/MoreLabelToggle
--]]
@ -442,7 +421,7 @@ function UIBattleDeployView:InitGenerate__15(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__16(Root, data)
function UIBattleDeployView:InitGenerate__15(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/StrStart
--]]
@ -454,7 +433,7 @@ function UIBattleDeployView:InitGenerate__16(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__17(Root, data)
function UIBattleDeployView:InitGenerate__16(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/AgiStart
--]]
@ -466,7 +445,7 @@ function UIBattleDeployView:InitGenerate__17(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__18(Root, data)
function UIBattleDeployView:InitGenerate__17(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/LukEnd
--]]
@ -478,7 +457,7 @@ function UIBattleDeployView:InitGenerate__18(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__19(Root, data)
function UIBattleDeployView:InitGenerate__18(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/StrEnd
--]]
@ -490,7 +469,7 @@ function UIBattleDeployView:InitGenerate__19(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__20(Root, data)
function UIBattleDeployView:InitGenerate__19(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/VitEnd
--]]
@ -502,7 +481,7 @@ function UIBattleDeployView:InitGenerate__20(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__21(Root, data)
function UIBattleDeployView:InitGenerate__20(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/AgiEnd
--]]
@ -514,7 +493,7 @@ function UIBattleDeployView:InitGenerate__21(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__22(Root, data)
function UIBattleDeployView:InitGenerate__21(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/DexEnd
--]]
@ -526,7 +505,7 @@ function UIBattleDeployView:InitGenerate__22(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__23(Root, data)
function UIBattleDeployView:InitGenerate__22(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/IntStart
--]]
@ -538,7 +517,7 @@ function UIBattleDeployView:InitGenerate__23(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__24(Root, data)
function UIBattleDeployView:InitGenerate__23(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/DexStart
--]]
@ -550,7 +529,7 @@ function UIBattleDeployView:InitGenerate__24(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__25(Root, data)
function UIBattleDeployView:InitGenerate__24(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/VitStart
--]]
@ -562,7 +541,7 @@ function UIBattleDeployView:InitGenerate__25(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__26(Root, data)
function UIBattleDeployView:InitGenerate__25(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/IntEnd
--]]
@ -574,7 +553,7 @@ function UIBattleDeployView:InitGenerate__26(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__27(Root, data)
function UIBattleDeployView:InitGenerate__26(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/attr_plane
--]]
@ -588,7 +567,7 @@ function UIBattleDeployView:InitGenerate__27(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__28(Root, data)
function UIBattleDeployView:InitGenerate__27(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/LukStart
--]]
@ -600,7 +579,7 @@ function UIBattleDeployView:InitGenerate__28(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__29(Root, data)
function UIBattleDeployView:InitGenerate__28(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Left/Figure/Center
--]]
@ -612,7 +591,7 @@ function UIBattleDeployView:InitGenerate__29(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__30(Root, data)
function UIBattleDeployView:InitGenerate__29(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Right/AttrScrollRect
--]]
@ -626,7 +605,7 @@ function UIBattleDeployView:InitGenerate__30(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__31(Root, data)
function UIBattleDeployView:InitGenerate__30(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Right/AttrScrollRect/Viewport/AttrContent
--]]
@ -640,7 +619,7 @@ function UIBattleDeployView:InitGenerate__31(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__32(Root, data)
function UIBattleDeployView:InitGenerate__31(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Right/AttrScrollRect/Viewport/AttrContent/BaseSView
--]]
@ -656,7 +635,7 @@ function UIBattleDeployView:InitGenerate__32(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__33(Root, data)
function UIBattleDeployView:InitGenerate__32(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Right/AttrScrollRect/Viewport/AttrContent/BaseSView/Viewport/AttrContent2
--]]
@ -670,7 +649,7 @@ function UIBattleDeployView:InitGenerate__33(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__34(Root, data)
function UIBattleDeployView:InitGenerate__33(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab1/Right/AttrScrollRect/Viewport/AttrContent/NatureAttrItem
--]]
@ -683,7 +662,7 @@ function UIBattleDeployView:InitGenerate__34(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__35(Root, data)
function UIBattleDeployView:InitGenerate__34(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab2
--]]
@ -695,7 +674,7 @@ function UIBattleDeployView:InitGenerate__35(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__36(Root, data)
function UIBattleDeployView:InitGenerate__35(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab3
--]]
@ -707,7 +686,7 @@ function UIBattleDeployView:InitGenerate__36(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__37(Root, data)
function UIBattleDeployView:InitGenerate__36(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab4
--]]
@ -719,7 +698,7 @@ function UIBattleDeployView:InitGenerate__37(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__38(Root, data)
function UIBattleDeployView:InitGenerate__37(Root, data)
--[[
Animator/Pad/DeployPad/Tab/Tab5
--]]
@ -731,7 +710,7 @@ function UIBattleDeployView:InitGenerate__38(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__39(Root, data)
function UIBattleDeployView:InitGenerate__38(Root, data)
--[[
Animator/Pad/DeployPad/TabToggleGroup
--]]
@ -745,7 +724,7 @@ function UIBattleDeployView:InitGenerate__39(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__40(Root, data)
function UIBattleDeployView:InitGenerate__39(Root, data)
--[[
Animator/Pad/DeployPad/TabToggleGroup/PropertyToggle
--]]
@ -759,7 +738,7 @@ function UIBattleDeployView:InitGenerate__40(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__41(Root, data)
function UIBattleDeployView:InitGenerate__40(Root, data)
--[[
Animator/Pad/DeployPad/TabToggleGroup/Skill1Toggle
--]]
@ -773,7 +752,7 @@ function UIBattleDeployView:InitGenerate__41(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__42(Root, data)
function UIBattleDeployView:InitGenerate__41(Root, data)
--[[
Animator/Pad/DeployPad/TabToggleGroup/Skill2Toggle
--]]
@ -787,7 +766,7 @@ function UIBattleDeployView:InitGenerate__42(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__43(Root, data)
function UIBattleDeployView:InitGenerate__42(Root, data)
--[[
Animator/Pad/DeployPad/TabToggleGroup/Skill3Toggle
--]]
@ -801,7 +780,7 @@ function UIBattleDeployView:InitGenerate__43(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__44(Root, data)
function UIBattleDeployView:InitGenerate__43(Root, data)
--[[
Animator/Pad/DeployPad/TabToggleGroup/Skill4Toggle
--]]
@ -815,7 +794,7 @@ function UIBattleDeployView:InitGenerate__44(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__45(Root, data)
function UIBattleDeployView:InitGenerate__44(Root, data)
--[[
Animator/Pad/Heads
--]]
@ -827,7 +806,7 @@ function UIBattleDeployView:InitGenerate__45(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__46(Root, data)
function UIBattleDeployView:InitGenerate__45(Root, data)
--[[
Animator/Pad/Heads/HeadToggleGroup
--]]
@ -841,7 +820,7 @@ function UIBattleDeployView:InitGenerate__46(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__47(Root, data)
function UIBattleDeployView:InitGenerate__46(Root, data)
--[[
Animator/Pad/Heads/HeadToggleGroup/Head1
--]]
@ -857,7 +836,7 @@ function UIBattleDeployView:InitGenerate__47(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__48(Root, data)
function UIBattleDeployView:InitGenerate__47(Root, data)
--[[
Animator/Pad/Heads/HeadToggleGroup/Head2
--]]
@ -873,7 +852,7 @@ function UIBattleDeployView:InitGenerate__48(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__49(Root, data)
function UIBattleDeployView:InitGenerate__48(Root, data)
--[[
Animator/Pad/Heads/HeadToggleGroup/Head3
--]]
@ -889,7 +868,7 @@ function UIBattleDeployView:InitGenerate__49(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__50(Root, data)
function UIBattleDeployView:InitGenerate__49(Root, data)
--[[
Animator/Pad/Heads/HeadToggleGroup/Head4
--]]
@ -905,7 +884,7 @@ function UIBattleDeployView:InitGenerate__50(Root, data)
end
---@private
function UIBattleDeployView:InitGenerate__51(Root, data)
function UIBattleDeployView:InitGenerate__50(Root, data)
--[[
Animator/Pad/StartBtn
--]]
@ -943,6 +922,10 @@ function UIBattleDeployView:GenerateDestroy()
tolua.setpeer(self.labelToggleGroup, nil)
end
self.labelToggleGroup = nil
if tolua.getpeer(self.currentLabelToggle) ~= nil then
tolua.setpeer(self.currentLabelToggle, nil)
end
self.currentLabelToggle = nil
if tolua.getpeer(self.maxStrLabelToggle) ~= nil then
tolua.setpeer(self.maxStrLabelToggle, nil)
end
@ -955,9 +938,6 @@ function UIBattleDeployView:GenerateDestroy()
tolua.setpeer(self.maxVitLabelToggle, nil)
end
self.maxVitLabelToggle = nil
if self.maxIntLabelToggle.GenerateDestroy ~= nil then
self.maxIntLabelToggle:GenerateDestroy()
end
if tolua.getpeer(self.maxIntLabelToggle) ~= nil then
tolua.setpeer(self.maxIntLabelToggle, nil)
end
@ -970,14 +950,6 @@ function UIBattleDeployView:GenerateDestroy()
tolua.setpeer(self.maxLukLabelToggle, nil)
end
self.maxLukLabelToggle = nil
if tolua.getpeer(self.hexLabelToggle) ~= nil then
tolua.setpeer(self.hexLabelToggle, nil)
end
self.hexLabelToggle = nil
if tolua.getpeer(self.recommendLabelToggle) ~= nil then
tolua.setpeer(self.recommendLabelToggle, nil)
end
self.recommendLabelToggle = nil
if tolua.getpeer(self.moreLabelToggle) ~= nil then
tolua.setpeer(self.moreLabelToggle, nil)
end

1
Assets/Lua/UI/UIRoleMain/UIRoleNaturePointCtr.lua
View File

@ -258,6 +258,7 @@ function UIRoleNaturePointCtr:CalcAutoPoints()
end
local newTotalCount = SDataUtil.Add(oldTotalCount, totalCount)
for i = 1, #autoData do
totalStatus[i] = true
local type = autoData[i][1]

1
Assets/Lua/UI/UIRoleMain/UIRoleNaturePointView.lua
View File

@ -311,7 +311,6 @@ function UIRoleNaturePointView:ChangeAttrPreview(attrType, increase)
self.leadBox.restPoint.number1.text.text = tostring(totalPoints)
oneAttrAddDic[attrType] = oneAttrAddDic[attrType] + (increase and 1 or -1)
self:RefreshAllAttr(attrType)
end