神兵主界面修改提交

dev_chengFeng
wangzhenxing 2023-03-28 17:51:43 +08:00
parent 826f58ce6e
commit 24ad78e8da
7 changed files with 492 additions and 177 deletions

View File

@ -44,6 +44,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 35857469}
- component: {fileID: 2496193899151812206}
- component: {fileID: 6161508456175860435}
m_Layer: 5
m_Name: pokemonLive
m_TagString: Untagged
@ -67,9 +69,46 @@ RectTransform:
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: 100, y: 100}
m_AnchoredPosition: {x: 0, y: 60}
m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2496193899151812206
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 35857468}
m_CullTransparentMesh: 0
--- !u!114 &6161508456175860435
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 35857468}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &60144692
GameObject:
m_ObjectHideFlags: 0
@ -440,6 +479,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 135156572}
- component: {fileID: 3381066222205562619}
- component: {fileID: 109707583493225849}
m_Layer: 5
m_Name: pokemonLive
m_TagString: Untagged
@ -463,9 +504,46 @@ RectTransform:
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: 100, y: 100}
m_AnchoredPosition: {x: 0, y: 60}
m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3381066222205562619
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135156571}
m_CullTransparentMesh: 0
--- !u!114 &109707583493225849
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135156571}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &137932279
GameObject:
m_ObjectHideFlags: 0
@ -1278,7 +1356,7 @@ RectTransform:
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.8, y: 72.4}
m_AnchoredPosition: {x: 0, y: 120}
m_SizeDelta: {x: 52.12, y: 58.43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &316523303
@ -1382,7 +1460,7 @@ GameObject:
- component: {fileID: 347532151}
- component: {fileID: 347532150}
m_Layer: 5
m_Name: pokemon1
m_Name: pokemon2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -1599,7 +1677,7 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.2
m_LineSpacing: 1
m_Text: "\u9752\u9E3E"
LanguageIndex: 0
--- !u!1 &389146962
@ -1799,7 +1877,7 @@ GameObject:
- component: {fileID: 422876325}
- component: {fileID: 422876324}
m_Layer: 5
m_Name: addClick1
m_Name: addClick5
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -1903,6 +1981,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 427280795}
- component: {fileID: 3959654957484208295}
- component: {fileID: 5353671735937515601}
m_Layer: 5
m_Name: pokemonLive
m_TagString: Untagged
@ -1926,9 +2006,46 @@ RectTransform:
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: 100, y: 100}
m_AnchoredPosition: {x: 0, y: 60}
m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3959654957484208295
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 427280794}
m_CullTransparentMesh: 0
--- !u!114 &5353671735937515601
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 427280794}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &452450859
GameObject:
m_ObjectHideFlags: 0
@ -2924,7 +3041,7 @@ GameObject:
- component: {fileID: 641605474}
- component: {fileID: 641605473}
m_Layer: 5
m_Name: addClick1
m_Name: addClick2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -3053,7 +3170,7 @@ RectTransform:
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.8, y: 72.4}
m_AnchoredPosition: {x: 0, y: 120}
m_SizeDelta: {x: 52.12, y: 58.43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &647989811
@ -3185,7 +3302,7 @@ GameObject:
- component: {fileID: 651295852}
- component: {fileID: 651295851}
m_Layer: 5
m_Name: pokemon1
m_Name: pokemon3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -3514,8 +3631,8 @@ RectTransform:
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: -103.35, y: 80.01}
m_SizeDelta: {x: 58.06, y: 185.36}
m_AnchoredPosition: {x: -120, y: 50}
m_SizeDelta: {x: 80, y: 320}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &702516042
CanvasRenderer:
@ -4022,8 +4139,8 @@ RectTransform:
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: -103.35, y: 80.01}
m_SizeDelta: {x: 58.06, y: 185.36}
m_AnchoredPosition: {x: -120, y: 50}
m_SizeDelta: {x: 80, y: 320}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &837225096
CanvasRenderer:
@ -4786,7 +4903,7 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.2
m_LineSpacing: 1
m_Text: "\u9752\u9E3E"
LanguageIndex: 0
--- !u!1 &1019034255
@ -4823,7 +4940,7 @@ RectTransform:
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.8, y: 72.4}
m_AnchoredPosition: {x: 0, y: 120}
m_SizeDelta: {x: 52.12, y: 58.43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1019034258
@ -4954,7 +5071,7 @@ GameObject:
- component: {fileID: 1058349320}
- component: {fileID: 1058349319}
m_Layer: 5
m_Name: pokemon1
m_Name: pokemon6
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -5285,6 +5402,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1141807891}
- component: {fileID: 5714770620869037684}
- component: {fileID: 449608339607698379}
m_Layer: 5
m_Name: pokemonLive
m_TagString: Untagged
@ -5308,9 +5427,46 @@ RectTransform:
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: 100, y: 100}
m_AnchoredPosition: {x: 0, y: 60}
m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5714770620869037684
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1141807890}
m_CullTransparentMesh: 0
--- !u!114 &449608339607698379
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1141807890}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1212248024
GameObject:
m_ObjectHideFlags: 0
@ -5761,8 +5917,8 @@ RectTransform:
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: -103.35, y: 80.01}
m_SizeDelta: {x: 58.06, y: 185.36}
m_AnchoredPosition: {x: -120, y: 50}
m_SizeDelta: {x: 80, y: 320}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1327801934
CanvasRenderer:
@ -5814,7 +5970,7 @@ GameObject:
- component: {fileID: 1328446422}
- component: {fileID: 1328446421}
m_Layer: 5
m_Name: addClick1
m_Name: addClick3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -6452,6 +6608,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1438325669}
- component: {fileID: 4202021098531672415}
- component: {fileID: 4751300675900199877}
m_Layer: 5
m_Name: pokemonLive
m_TagString: Untagged
@ -6475,9 +6633,46 @@ RectTransform:
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: 100, y: 100}
m_AnchoredPosition: {x: 0, y: 60}
m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4202021098531672415
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1438325668}
m_CullTransparentMesh: 0
--- !u!114 &4751300675900199877
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1438325668}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1458237662
GameObject:
m_ObjectHideFlags: 0
@ -6811,7 +7006,7 @@ RectTransform:
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.8, y: 72.4}
m_AnchoredPosition: {x: 0, y: 120}
m_SizeDelta: {x: 52.12, y: 58.43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1491303310
@ -7132,7 +7327,7 @@ GameObject:
- component: {fileID: 1518079030}
- component: {fileID: 1518079029}
m_Layer: 5
m_Name: addClick1
m_Name: addClick4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -7463,7 +7658,7 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.2
m_LineSpacing: 1
m_Text: "\u9752\u9E3E"
LanguageIndex: 0
--- !u!1 &1587026101
@ -7586,7 +7781,7 @@ GameObject:
- component: {fileID: 1589245733}
- component: {fileID: 1589245732}
m_Layer: 5
m_Name: pokemon1
m_Name: pokemon5
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -8104,8 +8299,8 @@ RectTransform:
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: -103.35, y: 80.01}
m_SizeDelta: {x: 58.06, y: 185.36}
m_AnchoredPosition: {x: -120, y: 50}
m_SizeDelta: {x: 80, y: 320}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1650034494
CanvasRenderer:
@ -8301,7 +8496,7 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.2
m_LineSpacing: 1
m_Text: "\u9752\u9E3E"
LanguageIndex: 0
--- !u!1 &1686390600
@ -8420,8 +8615,8 @@ RectTransform:
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: -103.35, y: 80.01}
m_SizeDelta: {x: 58.06, y: 185.36}
m_AnchoredPosition: {x: -120, y: 50}
m_SizeDelta: {x: 80, y: 320}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1688541364
CanvasRenderer:
@ -9250,7 +9445,7 @@ GameObject:
- component: {fileID: 1963263940}
- component: {fileID: 1963263939}
m_Layer: 5
m_Name: pokemon1
m_Name: pokemon4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -9879,7 +10074,7 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.2
m_LineSpacing: 1
m_Text: "\u9752\u9E3E"
LanguageIndex: 0
--- !u!1 &2119215909
@ -9895,7 +10090,7 @@ GameObject:
- component: {fileID: 2119215912}
- component: {fileID: 2119215911}
m_Layer: 5
m_Name: addClick1
m_Name: addClick6
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -10099,7 +10294,7 @@ RectTransform:
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.8, y: 72.4}
m_AnchoredPosition: {x: 0, y: 120}
m_SizeDelta: {x: 52.12, y: 58.43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2126039068
@ -10252,7 +10447,7 @@ RectTransform:
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.8, y: 72.4}
m_AnchoredPosition: {x: 0, y: 120}
m_SizeDelta: {x: 52.12, y: 58.43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5334045173670167916
@ -20582,8 +20777,8 @@ RectTransform:
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.25, y: -15.6}
m_SizeDelta: {x: 37.06, y: 103.67}
m_AnchoredPosition: {x: 0, y: -20}
m_SizeDelta: {x: 37.1, y: 179}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6757490895614425711
CanvasRenderer:
@ -20618,14 +20813,14 @@ MonoBehaviour:
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.2
m_LineSpacing: 1
m_Text: "\u9752\u9E3E"
LanguageIndex: 0
--- !u!1 &2091131138184018576
@ -20854,7 +21049,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 194, y: -157.2}
m_AnchoredPosition: {x: 194, y: -157.2002}
m_SizeDelta: {x: 405, y: 138}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &986331373234966081
@ -30872,8 +31067,8 @@ RectTransform:
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: -103.35, y: 80.01}
m_SizeDelta: {x: 58.06, y: 185.36}
m_AnchoredPosition: {x: -120, y: 50}
m_SizeDelta: {x: 80, y: 320}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5825809413759638762
CanvasRenderer:
@ -47301,6 +47496,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5532992103500628566}
- component: {fileID: 6515976180665149042}
- component: {fileID: 6828767496158074987}
m_Layer: 5
m_Name: pokemonLive
m_TagString: Untagged
@ -47324,9 +47521,46 @@ RectTransform:
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: 100, y: 100}
m_AnchoredPosition: {x: 0, y: 60}
m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6515976180665149042
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7111423469311232707}
m_CullTransparentMesh: 0
--- !u!114 &6828767496158074987
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7111423469311232707}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7195730217382917537
GameObject:
m_ObjectHideFlags: 0

View File

@ -109,6 +109,7 @@ FIGHTUNITINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor();
FIGHTTEAMINFO = protobuf.Descriptor();
FIGHTTEAMINFO_FIGHTUNITLIST_FIELD = protobuf.FieldDescriptor();
FIGHTTEAMINFO_POKEMONUNITLIST_FIELD = protobuf.FieldDescriptor();
FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD = protobuf.FieldDescriptor();
FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD = protobuf.FieldDescriptor();
FIGHTTEAMINFO_SPECIALPASSIVE_FIELD = protobuf.FieldDescriptor();
FIGHTTEAMINFO_FIRSTCAMP_FIELD = protobuf.FieldDescriptor();
@ -520,6 +521,7 @@ TEAMSIMPLEINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO = protobuf.Descriptor();
TEAMONETEAMINFO_TEAM_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_MAGICSOLDIER_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_TOTALFORCE_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_REMAINHP_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_SEALSHOW_FIELD = protobuf.FieldDescriptor();
@ -1925,10 +1927,21 @@ FIGHTTEAMINFO_POKEMONUNITLIST_FIELD.message_type = FIGHTUNITINFO
FIGHTTEAMINFO_POKEMONUNITLIST_FIELD.type = 11
FIGHTTEAMINFO_POKEMONUNITLIST_FIELD.cpp_type = 10
FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.name = "MagicSoldierList"
FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.full_name = ".rpc.protocols.FightTeamInfo.MagicSoldierList"
FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.number = 3
FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.index = 2
FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.label = 3
FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.has_default_value = false
FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.default_value = {}
FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.message_type = FIGHTUNITINFO
FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.type = 11
FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD.cpp_type = 10
FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.name = "teamPassiveList"
FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.full_name = ".rpc.protocols.FightTeamInfo.teamPassiveList"
FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.number = 3
FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.index = 2
FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.number = 4
FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.index = 3
FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.label = 1
FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.has_default_value = false
FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.default_value = ""
@ -1937,8 +1950,8 @@ FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD.cpp_type = 9
FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.name = "specialPassive"
FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.full_name = ".rpc.protocols.FightTeamInfo.specialPassive"
FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.number = 4
FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.index = 3
FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.number = 5
FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.index = 4
FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.label = 1
FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.has_default_value = false
FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.default_value = ""
@ -1947,8 +1960,8 @@ FIGHTTEAMINFO_SPECIALPASSIVE_FIELD.cpp_type = 9
FIGHTTEAMINFO_FIRSTCAMP_FIELD.name = "firstCamp"
FIGHTTEAMINFO_FIRSTCAMP_FIELD.full_name = ".rpc.protocols.FightTeamInfo.firstCamp"
FIGHTTEAMINFO_FIRSTCAMP_FIELD.number = 5
FIGHTTEAMINFO_FIRSTCAMP_FIELD.index = 4
FIGHTTEAMINFO_FIRSTCAMP_FIELD.number = 6
FIGHTTEAMINFO_FIRSTCAMP_FIELD.index = 5
FIGHTTEAMINFO_FIRSTCAMP_FIELD.label = 1
FIGHTTEAMINFO_FIRSTCAMP_FIELD.has_default_value = false
FIGHTTEAMINFO_FIRSTCAMP_FIELD.default_value = 0
@ -1957,8 +1970,8 @@ FIGHTTEAMINFO_FIRSTCAMP_FIELD.cpp_type = 1
FIGHTTEAMINFO_FORCESCORE_FIELD.name = "forceScore"
FIGHTTEAMINFO_FORCESCORE_FIELD.full_name = ".rpc.protocols.FightTeamInfo.forceScore"
FIGHTTEAMINFO_FORCESCORE_FIELD.number = 6
FIGHTTEAMINFO_FORCESCORE_FIELD.index = 5
FIGHTTEAMINFO_FORCESCORE_FIELD.number = 7
FIGHTTEAMINFO_FORCESCORE_FIELD.index = 6
FIGHTTEAMINFO_FORCESCORE_FIELD.label = 1
FIGHTTEAMINFO_FORCESCORE_FIELD.has_default_value = false
FIGHTTEAMINFO_FORCESCORE_FIELD.default_value = 0
@ -1969,7 +1982,7 @@ FIGHTTEAMINFO.name = "FightTeamInfo"
FIGHTTEAMINFO.full_name = ".rpc.protocols.FightTeamInfo"
FIGHTTEAMINFO.nested_types = {}
FIGHTTEAMINFO.enum_types = {}
FIGHTTEAMINFO.fields = {FIGHTTEAMINFO_FIGHTUNITLIST_FIELD, FIGHTTEAMINFO_POKEMONUNITLIST_FIELD, FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD, FIGHTTEAMINFO_SPECIALPASSIVE_FIELD, FIGHTTEAMINFO_FIRSTCAMP_FIELD, FIGHTTEAMINFO_FORCESCORE_FIELD}
FIGHTTEAMINFO.fields = {FIGHTTEAMINFO_FIGHTUNITLIST_FIELD, FIGHTTEAMINFO_POKEMONUNITLIST_FIELD, FIGHTTEAMINFO_MAGICSOLDIERLIST_FIELD, FIGHTTEAMINFO_TEAMPASSIVELIST_FIELD, FIGHTTEAMINFO_SPECIALPASSIVE_FIELD, FIGHTTEAMINFO_FIRSTCAMP_FIELD, FIGHTTEAMINFO_FORCESCORE_FIELD}
FIGHTTEAMINFO.is_extendable = false
FIGHTTEAMINFO.extensions = {}
EVENTBEHAVIORVALUES_BEHAVIORVALUES_FIELD.name = "behaviorValues"
@ -5843,10 +5856,21 @@ TEAMONETEAMINFO_POKEMONINFOS_FIELD.message_type = TEAMSIMPLEINFO
TEAMONETEAMINFO_POKEMONINFOS_FIELD.type = 11
TEAMONETEAMINFO_POKEMONINFOS_FIELD.cpp_type = 10
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.name = "MagicSoldier"
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.MagicSoldier"
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.number = 3
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.index = 2
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.label = 3
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.has_default_value = false
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.default_value = {}
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.message_type = TEAMSIMPLEINFO
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.type = 11
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.cpp_type = 10
TEAMONETEAMINFO_TOTALFORCE_FIELD.name = "totalForce"
TEAMONETEAMINFO_TOTALFORCE_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.totalForce"
TEAMONETEAMINFO_TOTALFORCE_FIELD.number = 3
TEAMONETEAMINFO_TOTALFORCE_FIELD.index = 2
TEAMONETEAMINFO_TOTALFORCE_FIELD.number = 4
TEAMONETEAMINFO_TOTALFORCE_FIELD.index = 3
TEAMONETEAMINFO_TOTALFORCE_FIELD.label = 1
TEAMONETEAMINFO_TOTALFORCE_FIELD.has_default_value = false
TEAMONETEAMINFO_TOTALFORCE_FIELD.default_value = 0
@ -5855,8 +5879,8 @@ TEAMONETEAMINFO_TOTALFORCE_FIELD.cpp_type = 1
TEAMONETEAMINFO_REMAINHP_FIELD.name = "remainHp"
TEAMONETEAMINFO_REMAINHP_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.remainHp"
TEAMONETEAMINFO_REMAINHP_FIELD.number = 4
TEAMONETEAMINFO_REMAINHP_FIELD.index = 3
TEAMONETEAMINFO_REMAINHP_FIELD.number = 5
TEAMONETEAMINFO_REMAINHP_FIELD.index = 4
TEAMONETEAMINFO_REMAINHP_FIELD.label = 3
TEAMONETEAMINFO_REMAINHP_FIELD.has_default_value = false
TEAMONETEAMINFO_REMAINHP_FIELD.default_value = {}
@ -5865,8 +5889,8 @@ TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 2
TEAMONETEAMINFO_SEALSHOW_FIELD.name = "sealShow"
TEAMONETEAMINFO_SEALSHOW_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.sealShow"
TEAMONETEAMINFO_SEALSHOW_FIELD.number = 5
TEAMONETEAMINFO_SEALSHOW_FIELD.index = 4
TEAMONETEAMINFO_SEALSHOW_FIELD.number = 6
TEAMONETEAMINFO_SEALSHOW_FIELD.index = 5
TEAMONETEAMINFO_SEALSHOW_FIELD.label = 3
TEAMONETEAMINFO_SEALSHOW_FIELD.has_default_value = false
TEAMONETEAMINFO_SEALSHOW_FIELD.default_value = {}
@ -5876,8 +5900,8 @@ TEAMONETEAMINFO_SEALSHOW_FIELD.cpp_type = 10
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.name = "transformationCardInfo"
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.transformationCardInfo"
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.number = 6
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.index = 5
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.number = 7
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.index = 6
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.label = 3
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.has_default_value = false
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.default_value = {}
@ -5887,8 +5911,8 @@ TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.cpp_type = 10
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.name = "sixiangxinfaInfo"
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.sixiangxinfaInfo"
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.number = 7
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.index = 6
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.number = 8
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.index = 7
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.label = 3
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.has_default_value = false
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.default_value = {}
@ -5898,8 +5922,8 @@ TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.cpp_type = 10
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.name = "lifeGridInfo"
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.lifeGridInfo"
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.number = 8
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.index = 7
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.number = 9
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.index = 8
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.label = 3
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.has_default_value = false
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.default_value = {}
@ -5909,8 +5933,8 @@ TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.cpp_type = 10
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.name = "userMountInfo"
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.userMountInfo"
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.number = 9
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.index = 8
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.number = 10
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.index = 9
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.label = 3
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.has_default_value = false
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.default_value = {}
@ -5922,7 +5946,7 @@ TEAMONETEAMINFO.name = "TeamOneTeamInfo"
TEAMONETEAMINFO.full_name = ".rpc.protocols.TeamOneTeamInfo"
TEAMONETEAMINFO.nested_types = {}
TEAMONETEAMINFO.enum_types = {}
TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD, TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD, TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD, TEAMONETEAMINFO_LIFEGRIDINFO_FIELD, TEAMONETEAMINFO_USERMOUNTINFO_FIELD}
TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_MAGICSOLDIER_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD, TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD, TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD, TEAMONETEAMINFO_LIFEGRIDINFO_FIELD, TEAMONETEAMINFO_USERMOUNTINFO_FIELD}
TEAMONETEAMINFO.is_extendable = false
TEAMONETEAMINFO.extensions = {}
TEAMONEINFO_UID_FIELD.name = "uid"

File diff suppressed because one or more lines are too long

View File

@ -779,7 +779,12 @@ MAGICSOLDIERSTRONGREQUEST = protobuf.Descriptor();
MAGICSOLDIERSTRONGREQUEST_ID_FIELD = protobuf.FieldDescriptor();
MAGICSOLDIERSTRONGREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
MAGICSOLDIERSTRONGREQUEST_NUM_FIELD = protobuf.FieldDescriptor();
MAGICSOLDIERSTRONGREQUEST_COSTIDS_FIELD = protobuf.FieldDescriptor();
MAGICSOLDIERSTRONGRESPONSE = protobuf.Descriptor();
MAGICSOLDIEREXCHANGEREQUEST = protobuf.Descriptor();
MAGICSOLDIEREXCHANGEREQUEST_ID_FIELD = protobuf.FieldDescriptor();
MAGICSOLDIEREXCHANGEREQUEST_ID2_FIELD = protobuf.FieldDescriptor();
MAGICSOLDIEREXCHANGERESPONSE = protobuf.Descriptor();
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.ErrorMsgResponse.msg"
@ -7868,11 +7873,21 @@ MAGICSOLDIERSTRONGREQUEST_NUM_FIELD.default_value = 0
MAGICSOLDIERSTRONGREQUEST_NUM_FIELD.type = 5
MAGICSOLDIERSTRONGREQUEST_NUM_FIELD.cpp_type = 1
MAGICSOLDIERSTRONGREQUEST_COSTIDS_FIELD.name = "costIds"
MAGICSOLDIERSTRONGREQUEST_COSTIDS_FIELD.full_name = ".rpc.protocols.MagicSoldierStrongRequest.costIds"
MAGICSOLDIERSTRONGREQUEST_COSTIDS_FIELD.number = 4
MAGICSOLDIERSTRONGREQUEST_COSTIDS_FIELD.index = 3
MAGICSOLDIERSTRONGREQUEST_COSTIDS_FIELD.label = 3
MAGICSOLDIERSTRONGREQUEST_COSTIDS_FIELD.has_default_value = false
MAGICSOLDIERSTRONGREQUEST_COSTIDS_FIELD.default_value = {}
MAGICSOLDIERSTRONGREQUEST_COSTIDS_FIELD.type = 9
MAGICSOLDIERSTRONGREQUEST_COSTIDS_FIELD.cpp_type = 9
MAGICSOLDIERSTRONGREQUEST.name = "MagicSoldierStrongRequest"
MAGICSOLDIERSTRONGREQUEST.full_name = ".rpc.protocols.MagicSoldierStrongRequest"
MAGICSOLDIERSTRONGREQUEST.nested_types = {}
MAGICSOLDIERSTRONGREQUEST.enum_types = {}
MAGICSOLDIERSTRONGREQUEST.fields = {MAGICSOLDIERSTRONGREQUEST_ID_FIELD, MAGICSOLDIERSTRONGREQUEST_TYPE_FIELD, MAGICSOLDIERSTRONGREQUEST_NUM_FIELD}
MAGICSOLDIERSTRONGREQUEST.fields = {MAGICSOLDIERSTRONGREQUEST_ID_FIELD, MAGICSOLDIERSTRONGREQUEST_TYPE_FIELD, MAGICSOLDIERSTRONGREQUEST_NUM_FIELD, MAGICSOLDIERSTRONGREQUEST_COSTIDS_FIELD}
MAGICSOLDIERSTRONGREQUEST.is_extendable = false
MAGICSOLDIERSTRONGREQUEST.extensions = {}
MAGICSOLDIERSTRONGRESPONSE.name = "MagicSoldierStrongResponse"
@ -7882,6 +7897,40 @@ MAGICSOLDIERSTRONGRESPONSE.enum_types = {}
MAGICSOLDIERSTRONGRESPONSE.fields = {}
MAGICSOLDIERSTRONGRESPONSE.is_extendable = false
MAGICSOLDIERSTRONGRESPONSE.extensions = {}
MAGICSOLDIEREXCHANGEREQUEST_ID_FIELD.name = "id"
MAGICSOLDIEREXCHANGEREQUEST_ID_FIELD.full_name = ".rpc.protocols.magicSoldierExchangeRequest.id"
MAGICSOLDIEREXCHANGEREQUEST_ID_FIELD.number = 1
MAGICSOLDIEREXCHANGEREQUEST_ID_FIELD.index = 0
MAGICSOLDIEREXCHANGEREQUEST_ID_FIELD.label = 1
MAGICSOLDIEREXCHANGEREQUEST_ID_FIELD.has_default_value = false
MAGICSOLDIEREXCHANGEREQUEST_ID_FIELD.default_value = ""
MAGICSOLDIEREXCHANGEREQUEST_ID_FIELD.type = 9
MAGICSOLDIEREXCHANGEREQUEST_ID_FIELD.cpp_type = 9
MAGICSOLDIEREXCHANGEREQUEST_ID2_FIELD.name = "id2"
MAGICSOLDIEREXCHANGEREQUEST_ID2_FIELD.full_name = ".rpc.protocols.magicSoldierExchangeRequest.id2"
MAGICSOLDIEREXCHANGEREQUEST_ID2_FIELD.number = 2
MAGICSOLDIEREXCHANGEREQUEST_ID2_FIELD.index = 1
MAGICSOLDIEREXCHANGEREQUEST_ID2_FIELD.label = 1
MAGICSOLDIEREXCHANGEREQUEST_ID2_FIELD.has_default_value = false
MAGICSOLDIEREXCHANGEREQUEST_ID2_FIELD.default_value = ""
MAGICSOLDIEREXCHANGEREQUEST_ID2_FIELD.type = 9
MAGICSOLDIEREXCHANGEREQUEST_ID2_FIELD.cpp_type = 9
MAGICSOLDIEREXCHANGEREQUEST.name = "magicSoldierExchangeRequest"
MAGICSOLDIEREXCHANGEREQUEST.full_name = ".rpc.protocols.magicSoldierExchangeRequest"
MAGICSOLDIEREXCHANGEREQUEST.nested_types = {}
MAGICSOLDIEREXCHANGEREQUEST.enum_types = {}
MAGICSOLDIEREXCHANGEREQUEST.fields = {MAGICSOLDIEREXCHANGEREQUEST_ID_FIELD, MAGICSOLDIEREXCHANGEREQUEST_ID2_FIELD}
MAGICSOLDIEREXCHANGEREQUEST.is_extendable = false
MAGICSOLDIEREXCHANGEREQUEST.extensions = {}
MAGICSOLDIEREXCHANGERESPONSE.name = "MagicSoldierExchangeResponse"
MAGICSOLDIEREXCHANGERESPONSE.full_name = ".rpc.protocols.MagicSoldierExchangeResponse"
MAGICSOLDIEREXCHANGERESPONSE.nested_types = {}
MAGICSOLDIEREXCHANGERESPONSE.enum_types = {}
MAGICSOLDIEREXCHANGERESPONSE.fields = {}
MAGICSOLDIEREXCHANGERESPONSE.is_extendable = false
MAGICSOLDIEREXCHANGERESPONSE.extensions = {}
ActiveUserMountRequest = protobuf.Message(ACTIVEUSERMOUNTREQUEST)
ActiveUserMountResponse = protobuf.Message(ACTIVEUSERMOUNTRESPONSE)
@ -8017,6 +8066,7 @@ LoginConfirmRequest = protobuf.Message(LOGINCONFIRMREQUEST)
LoginRequest = protobuf.Message(LOGINREQUEST)
LoginResponse = protobuf.Message(LOGINRESPONSE)
LuckWheelIndication = protobuf.Message(LUCKWHEELINDICATION)
MagicSoldierExchangeResponse = protobuf.Message(MAGICSOLDIEREXCHANGERESPONSE)
MagicSoldierInfoRequest = protobuf.Message(MAGICSOLDIERINFOREQUEST)
MagicSoldierInfoResponse = protobuf.Message(MAGICSOLDIERINFORESPONSE)
MagicSoldierLocationRequest = protobuf.Message(MAGICSOLDIERLOCATIONREQUEST)
@ -8153,6 +8203,7 @@ blessChooseResponse = protobuf.Message(BLESSCHOOSERESPONSE)
blessRefresh = protobuf.Message(BLESSREFRESH)
blessResponse = protobuf.Message(BLESSRESPONSE)
blessSaveRequest = protobuf.Message(BLESSSAVEREQUEST)
magicSoldierExchangeRequest = protobuf.Message(MAGICSOLDIEREXCHANGEREQUEST)
sendFriendInfoIndication = protobuf.Message(SENDFRIENDINFOINDICATION)
storeUpdateIndication = protobuf.Message(STOREUPDATEINDICATION)
upDataQuestionRequest = protobuf.Message(UPDATAQUESTIONREQUEST)

View File

@ -91,8 +91,8 @@ end
function GodWeaponListPanel:OnDestroy()
for i = 1, #this.contents do
this.contents[i].view:OnDestroy()
this.spLoader:Destroy()
end
this.spLoader:Destroy()
end
return GodWeaponListPanel

View File

@ -6,9 +6,9 @@ local PokemonGoList = {}
local PokemonGoListRedPoin = {}
local PokemonEffectList = {}
local EffectConfig = {
[3] = {name = "fx_linshousan_di", offset = Vector3.New(-4, -26, 0)},
[4] = {name = "fx_linshousan_zhong", offset = Vector3.New(-4, -26, 0)},
[5] = {name = "fx_linshousan_gao", offset = Vector3.New(-4, -26, 0)},
[5] = {name = "fx_linshousan_di", offset = Vector3.New(-4, -26, 0)},
[6] = {name = "fx_linshousan_zhong", offset = Vector3.New(-4, -26, 0)},
[7] = {name = "fx_linshousan_gao", offset = Vector3.New(-4, -26, 0)},
}
local PokemonDataList = {}
@ -38,7 +38,7 @@ function GodWeaponMainPanel:InitComponent()
this.roleGrid=Util.GetGameObject(this.gameObject,"lineParent")
for i = 1, 6 do
PokemonList[i] = Util.GetGameObject(self.transform, "PokemonList/singlePokemon (".. i ..")/singlePokemon")
PokemonGoList[i] = Util.GetGameObject(PokemonList[i], "pokemon".. 1)
PokemonGoList[i] = Util.GetGameObject(PokemonList[i], "pokemon".. i)
PokemonGoListRedPoin[i] = Util.GetGameObject(PokemonGoList[i], "redPoint")
Util.GetGameObject( PokemonGoList[i], "upZhenInfo/titleImage/sortText"):GetComponent("Text").text = i
Util.GetGameObject( PokemonGoList[i], "addInfo/addInfo/sortText"):GetComponent("Text").text = i
@ -237,6 +237,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
local parent = Util.GetGameObject(go, "upZhenInfo/titleImage")
local nameText = Util.GetGameObject(parent, "nameText"):GetComponent("Text")
nameText.text = GetStringByEquipQua(spiritAnimalConfig.Quality, GetLanguageStrById(spiritAnimalConfig.Name))
local liveImg=Util.GetGameObject(go, "upZhenInfo/pokemonLive"):GetComponent("Image")
-- 特效显示配置
local config = EffectConfig[spiritAnimalConfig.Quality]
if config then
@ -255,8 +256,10 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
else
Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = Language[10065] .. curData.lv
end
-- Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = curData.lv.."级"
local curPokemonLive = Util.GetGameObject(go, "upZhenInfo/pokemonLive")
Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = curData.lv..""
--local curPokemonLive = Util.GetGameObject(go, "upZhenInfo/pokemonLive")
liveImg.sprite=this.spLoader:LoadSprite(GetResourcePath(spiritAnimalConfig.Icon))
for key, value in pairs(live2dList) do
if key == liveIndex then
-- LogPink("live2dList[liveIndex].name "..live2dList[key].name)
@ -304,6 +307,7 @@ function this.OnEndDrag(Pointgo,data)--结束拖动
local _j=tonumber(string.sub(Pointgo.transform.name,-1))
local pokemonObj=Util.GetGameObject(this.gameObject,"pokemon".._j)
if data.pointerEnter==nil then--防止拖到屏幕外
LogError("拖到屏幕外·········")
pokemonObj.transform:DOAnchorPos(Vector3.one,0)
pokemonObj.transform:SetParent(PokemonList[_j].transform)
pokemonObj.transform:SetSiblingIndex(1)
@ -325,49 +329,24 @@ function this.OnEndDrag(Pointgo,data)--结束拖动
if _i==nil then
_i=tonumber(string.sub(Pointgo.transform.name,-1))
end
LogError("namein==="..nameIn.." _i===".._i.." _j==".._j)
if nameIn=="DragView".._i then --有人
-- Log("有人")
local curData
local tarData
for i, v in ipairs(PokemonDataList ) do
if _j==v.position then
curData=v.pokemonId
end
if _i==v.position then
tarData=v.pokemonId
end
end
for i, v in ipairs(PokemonDataList) do
if _j==v.position then
PokemonDataList[i].pokemonId=tarData
end
if _i==v.position then
PokemonDataList[i].pokemonId=curData
end
end
NetManager.RequestMagicSoldierExchange(PokemonDataList[_j].Did,PokemonDataList[_i].Did,function()
GodWeaponManager.ChangeWeaponPos(PokemonDataList[_j].Did,PokemonDataList[_i].Did)
this.ShowPokemonList()
end)
elseif nameIn=="addClick".._i then
local did
for i, v in ipairs(PokemonDataList) do
if _j==v.position then
did=v.pokemonId
v.pokemonId = nil
end
end
for i, v in ipairs(PokemonDataList) do
if _i==v.position then
v.pokemonId=did
end
end
NetManager.RequestMagicSoldierLocation(PokemonDataList[_j].Did,_i,function()
GodWeaponManager.SetWeaponUpZhen(PokemonDataList[_j].Did,_i)
this.ShowPokemonList()
end)
end
this.line.gameObject:SetActive(false)
NetManager.ReplaceTeamPokemonInfoRequest(PokemonDataList, function()
local oldWarPower = 0
PokemonManager.RefreshPokemonFormation(PokemonDataList)
local newWarPower = 0
--飘战力
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
end)
this.ShowPokemonList()
end
function this.OnDrag(Pointgo,data)--拖动中
isClick = false

View File

@ -124,15 +124,32 @@ end
function this.SetWeaponUpZhen(id,pos)
if allGodWeapons[id] then
if pos~=0 then
local point1=allGodWeapons[id].point
if point1~=0 then
godWeaponTeamInfo[point1]=nil
end
allGodWeapons[id].point=pos
godWeaponTeamInfo[pos]=allGodWeapons[id]
else
allGodWeapons[id].point=pos
godWeaponTeamInfo[id]=nil
godWeaponTeamInfo[pos]=nil
end
end
end
--改变神兵位置
function this.ChangeWeaponPos(id1,id2)
if allGodWeapons[id1] and allGodWeapons[id2] then
local pos1=allGodWeapons[id1].point
local pos2=allGodWeapons[id2].point
allGodWeapons[id1].point=pos2
allGodWeapons[id2].point=pos1
godWeaponTeamInfo[pos1]=allGodWeapons[id2]
godWeaponTeamInfo[pos2]=allGodWeapons[id1]
end
end
--获取灵兽编队属性
function this.GetPokemonFormationAddPro()