特训加速修改提交
parent
862faf25fb
commit
60a8ea30f9
|
|
@ -380,14 +380,13 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 832139774490303523}
|
||||
- {fileID: 6634001650878838300}
|
||||
m_Father: {fileID: 7713108823737152484}
|
||||
m_RootOrder: 7
|
||||
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: -329, y: 375}
|
||||
m_AnchoredPosition: {x: -73, y: 375}
|
||||
m_SizeDelta: {x: 700, y: 200}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5731995663657916344
|
||||
|
|
@ -405,7 +404,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2019695999676730490}
|
||||
m_Enabled: 0
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
|
|
@ -415,7 +414,7 @@ MonoBehaviour:
|
|||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 4
|
||||
m_ChildAlignment: 3
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
|
|
@ -916,7 +915,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 239.96, y: 30}
|
||||
m_SizeDelta: {x: 150, y: 46.81}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!222 &1014229045091504399
|
||||
CanvasRenderer:
|
||||
|
|
@ -1110,190 +1109,6 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3604937271231100189
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3798521995576855920}
|
||||
- component: {fileID: 2389215221301876976}
|
||||
- component: {fileID: 4711131218854326259}
|
||||
m_Layer: 5
|
||||
m_Name: icon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3798521995576855920
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3604937271231100189}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 832139774490303523}
|
||||
m_RootOrder: 1
|
||||
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: 60, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2389215221301876976
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3604937271231100189}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4711131218854326259
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3604937271231100189}
|
||||
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: 21300000, guid: 3d49dff9e68d99042b98190141718524, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3644691647663267651
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 832139774490303523}
|
||||
- component: {fileID: 6568613684431232057}
|
||||
- component: {fileID: 7420707901538199741}
|
||||
- component: {fileID: 942624381013172398}
|
||||
m_Layer: 5
|
||||
m_Name: obj1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &832139774490303523
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3644691647663267651}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 100.375}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 3233603379760146630}
|
||||
- {fileID: 3798521995576855920}
|
||||
m_Father: {fileID: 6856224979044405629}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &6568613684431232057
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3644691647663267651}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 0
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 942624381013172398}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!222 &7420707901538199741
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3644691647663267651}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &942624381013172398
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3644691647663267651}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
|
||||
--- !u!1 &3905072855428743868
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1328,8 +1143,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.017487, y: -68.6}
|
||||
m_SizeDelta: {x: 867.7, y: 583.6}
|
||||
m_AnchoredPosition: {x: 0, y: -107}
|
||||
m_SizeDelta: {x: 973.05, y: 660.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &379930971882268418
|
||||
CanvasRenderer:
|
||||
|
|
@ -2216,80 +2031,6 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u9886\u53D6"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &6998007749151833574
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3233603379760146630}
|
||||
- component: {fileID: 3881908777193446183}
|
||||
- component: {fileID: 2257224052402553700}
|
||||
m_Layer: 5
|
||||
m_Name: frame
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3233603379760146630
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6998007749151833574}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 832139774490303523}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3881908777193446183
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6998007749151833574}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2257224052402553700
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6998007749151833574}
|
||||
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: 21300000, guid: cfcca910c2949224999293fc87438396, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &7232692980278121548
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2401,10 +2142,10 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 4439019684296277110}
|
||||
m_Father: {fileID: 6856224979044405629}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
@ -2897,7 +2638,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: 31.14, y: -32.05}
|
||||
m_AnchoredPosition: {x: 1385, y: -32.05}
|
||||
m_SizeDelta: {x: 950.6, y: 174.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8329726116675346782
|
||||
|
|
@ -3087,8 +2828,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.5, y: -85.000015}
|
||||
m_SizeDelta: {x: 852.3, y: 448}
|
||||
m_AnchoredPosition: {x: 0.012129, y: -122.48}
|
||||
m_SizeDelta: {x: 1034.9, y: 691.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5139312140037130326
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
|
|
@ -731,7 +731,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 239.96, y: 30}
|
||||
m_SizeDelta: {x: 240, y: 45.5}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!222 &1144205944544959120
|
||||
CanvasRenderer:
|
||||
|
|
@ -2240,7 +2240,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 239.96, y: 30}
|
||||
m_SizeDelta: {x: 165.1, y: 42.7}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!222 &1144205945452737055
|
||||
CanvasRenderer:
|
||||
|
|
@ -2615,7 +2615,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -45.9}
|
||||
m_AnchoredPosition: {x: 0, y: -45.900024}
|
||||
m_SizeDelta: {x: 200, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1144205945719001793
|
||||
|
|
@ -3651,8 +3651,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.5, y: -85.000015}
|
||||
m_SizeDelta: {x: 852.3, y: 448}
|
||||
m_AnchoredPosition: {x: 0, y: -67.40001}
|
||||
m_SizeDelta: {x: 852.3, y: 581.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1144205945953457069
|
||||
CanvasRenderer:
|
||||
|
|
@ -5716,7 +5716,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.3679245, g: 0.1458333, b: 0, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
|
|
|||
|
|
@ -399,6 +399,10 @@ TRAININGARCHITECTUREUPRESPONSE_INFO_FIELD = protobuf.FieldDescriptor();
|
|||
TRAININGARCHITECTUREINFOREQUEST = protobuf.Descriptor();
|
||||
TRAININGARCHITECTUREINFORESPONSE = protobuf.Descriptor();
|
||||
TRAININGARCHITECTUREINFORESPONSE_INFOS_FIELD = protobuf.FieldDescriptor();
|
||||
TRAININGPROPSPEEDREQUEST = protobuf.Descriptor();
|
||||
TRAININGPROPSPEEDREQUEST_ARCHID_FIELD = protobuf.FieldDescriptor();
|
||||
TRAININGPROPSPEEDREQUEST_ITEMID_FIELD = protobuf.FieldDescriptor();
|
||||
TRAININGPROPSPEEDREQUEST_NUM_FIELD = protobuf.FieldDescriptor();
|
||||
ASSISTINFOREQUEST = protobuf.Descriptor();
|
||||
ASSISTINFORESPONSE = protobuf.Descriptor();
|
||||
ASSISTINFORESPONSE_BOXS_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -4006,6 +4010,43 @@ TRAININGARCHITECTUREINFORESPONSE.enum_types = {}
|
|||
TRAININGARCHITECTUREINFORESPONSE.fields = {TRAININGARCHITECTUREINFORESPONSE_INFOS_FIELD}
|
||||
TRAININGARCHITECTUREINFORESPONSE.is_extendable = false
|
||||
TRAININGARCHITECTUREINFORESPONSE.extensions = {}
|
||||
TRAININGPROPSPEEDREQUEST_ARCHID_FIELD.name = "archId"
|
||||
TRAININGPROPSPEEDREQUEST_ARCHID_FIELD.full_name = ".rpc.protocols.TrainingPropSpeedRequest.archId"
|
||||
TRAININGPROPSPEEDREQUEST_ARCHID_FIELD.number = 1
|
||||
TRAININGPROPSPEEDREQUEST_ARCHID_FIELD.index = 0
|
||||
TRAININGPROPSPEEDREQUEST_ARCHID_FIELD.label = 1
|
||||
TRAININGPROPSPEEDREQUEST_ARCHID_FIELD.has_default_value = false
|
||||
TRAININGPROPSPEEDREQUEST_ARCHID_FIELD.default_value = 0
|
||||
TRAININGPROPSPEEDREQUEST_ARCHID_FIELD.type = 5
|
||||
TRAININGPROPSPEEDREQUEST_ARCHID_FIELD.cpp_type = 1
|
||||
|
||||
TRAININGPROPSPEEDREQUEST_ITEMID_FIELD.name = "itemId"
|
||||
TRAININGPROPSPEEDREQUEST_ITEMID_FIELD.full_name = ".rpc.protocols.TrainingPropSpeedRequest.itemId"
|
||||
TRAININGPROPSPEEDREQUEST_ITEMID_FIELD.number = 2
|
||||
TRAININGPROPSPEEDREQUEST_ITEMID_FIELD.index = 1
|
||||
TRAININGPROPSPEEDREQUEST_ITEMID_FIELD.label = 1
|
||||
TRAININGPROPSPEEDREQUEST_ITEMID_FIELD.has_default_value = false
|
||||
TRAININGPROPSPEEDREQUEST_ITEMID_FIELD.default_value = 0
|
||||
TRAININGPROPSPEEDREQUEST_ITEMID_FIELD.type = 5
|
||||
TRAININGPROPSPEEDREQUEST_ITEMID_FIELD.cpp_type = 1
|
||||
|
||||
TRAININGPROPSPEEDREQUEST_NUM_FIELD.name = "num"
|
||||
TRAININGPROPSPEEDREQUEST_NUM_FIELD.full_name = ".rpc.protocols.TrainingPropSpeedRequest.num"
|
||||
TRAININGPROPSPEEDREQUEST_NUM_FIELD.number = 3
|
||||
TRAININGPROPSPEEDREQUEST_NUM_FIELD.index = 2
|
||||
TRAININGPROPSPEEDREQUEST_NUM_FIELD.label = 1
|
||||
TRAININGPROPSPEEDREQUEST_NUM_FIELD.has_default_value = false
|
||||
TRAININGPROPSPEEDREQUEST_NUM_FIELD.default_value = 0
|
||||
TRAININGPROPSPEEDREQUEST_NUM_FIELD.type = 5
|
||||
TRAININGPROPSPEEDREQUEST_NUM_FIELD.cpp_type = 1
|
||||
|
||||
TRAININGPROPSPEEDREQUEST.name = "TrainingPropSpeedRequest"
|
||||
TRAININGPROPSPEEDREQUEST.full_name = ".rpc.protocols.TrainingPropSpeedRequest"
|
||||
TRAININGPROPSPEEDREQUEST.nested_types = {}
|
||||
TRAININGPROPSPEEDREQUEST.enum_types = {}
|
||||
TRAININGPROPSPEEDREQUEST.fields = {TRAININGPROPSPEEDREQUEST_ARCHID_FIELD, TRAININGPROPSPEEDREQUEST_ITEMID_FIELD, TRAININGPROPSPEEDREQUEST_NUM_FIELD}
|
||||
TRAININGPROPSPEEDREQUEST.is_extendable = false
|
||||
TRAININGPROPSPEEDREQUEST.extensions = {}
|
||||
ASSISTINFOREQUEST.name = "AssistInfoRequest"
|
||||
ASSISTINFOREQUEST.full_name = ".rpc.protocols.AssistInfoRequest"
|
||||
ASSISTINFOREQUEST.nested_types = {}
|
||||
|
|
@ -4222,6 +4263,7 @@ TrainingArchitectureInfoRequest = protobuf.Message(TRAININGARCHITECTUREINFOREQUE
|
|||
TrainingArchitectureInfoResponse = protobuf.Message(TRAININGARCHITECTUREINFORESPONSE)
|
||||
TrainingArchitectureUpRequest = protobuf.Message(TRAININGARCHITECTUREUPREQUEST)
|
||||
TrainingArchitectureUpResponse = protobuf.Message(TRAININGARCHITECTUREUPRESPONSE)
|
||||
TrainingPropSpeedRequest = protobuf.Message(TRAININGPROPSPEEDREQUEST)
|
||||
TrainingRequest = protobuf.Message(TRAININGREQUEST)
|
||||
TrainingResponse = protobuf.Message(TRAININGRESPONSE)
|
||||
TrainingUnlockSkillRequest = protobuf.Message(TRAININGUNLOCKSKILLREQUEST)
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -327,6 +327,8 @@ function TrainBuildPanel:SetTime()
|
|||
--curObj.effect2:SetActive(true)
|
||||
curObj.trainTimeTxt.text="修炼完成"
|
||||
curObj.RedPoint:SetActive(true)
|
||||
else
|
||||
|
||||
end
|
||||
else
|
||||
if curObj.data.heroId and curObj.data.heroId~="" then
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ local buildData=nil
|
|||
local curHeroId=nil
|
||||
local leftTime=-1
|
||||
local curSelectObj=nil
|
||||
local isSpeed=false
|
||||
local openPanel=nil
|
||||
function this:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.btn_close = Util.GetGameObject(self.gameObject,"bg/btn_close")
|
||||
|
|
@ -16,17 +18,16 @@ function this:InitComponent()
|
|||
self.btn_end = Util.GetGameObject(self.gameObject,"bg/btn_end")
|
||||
self.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
|
||||
self.scroll = Util.GetGameObject(self.gameObject,"selectList")
|
||||
self.itemPre = Util.GetGameObject(self.gameObject,"itemPre")
|
||||
self.itemPre = Util.GetGameObject(self.gameObject,"bg/itemInfo")
|
||||
self.title= Util.GetGameObject(self.gameObject,"bg/title"):GetComponent("Text")
|
||||
self.infoTxt=Util.GetGameObject(self.gameObject,"bg/info"):GetComponent("Text")
|
||||
self.costImg=Util.GetGameObject(self.gameObject,"bg/costImg"):GetComponent("Image")
|
||||
self.costNum=Util.GetGameObject(self.gameObject,"bg/costNum"):GetComponent("Text")
|
||||
|
||||
-- 设置循环滚动,万一内容不停地加
|
||||
local rootHight = self.scroll.transform.rect.height
|
||||
local width = self.scroll.transform.rect.width
|
||||
|
||||
self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scroll.transform,
|
||||
self.itemPre, nil, Vector2.New(width, rootHight), 1, 5, Vector2.New(20,75))
|
||||
self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(10,10))
|
||||
self.scrollView.moveTween.MomentumAmount = 1
|
||||
self.scrollView.moveTween.Strength = 2
|
||||
|
||||
|
|
@ -46,47 +47,20 @@ function this:InitComponent()
|
|||
|
||||
self.noneObj=Util.GetGameObject(self.gameObject,"NoneImage")
|
||||
|
||||
Util.GetGameObject(self.gameObject,"NoneImage/TextImage/Text"):GetComponent("Text").text="暂无可修炼英雄"
|
||||
|
||||
self.helpPosition = self.helpBtn:GetComponent("RectTransform").localPosition
|
||||
isSpeed=false
|
||||
end
|
||||
|
||||
function this:BindEvent()
|
||||
for i = 1, 4 do
|
||||
Util.AddOnceClick(self.tabListObj[i],function ()
|
||||
self.curSelect = i
|
||||
this:Refresh(true,false)
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
|
||||
Util.AddOnceClick(self.btn_close,function ()
|
||||
--LogError("点击确定按钮")
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddOnceClick(self.btn_star,function ()
|
||||
if buildData.heroId and buildData.heroId~="" then
|
||||
PopupTipPanel.ShowTip("已有修炼英雄")
|
||||
return
|
||||
end
|
||||
if curHeroId==nil or curHeroId=="" then
|
||||
PopupTipPanel.ShowTip("请选择修炼英雄")
|
||||
return
|
||||
end
|
||||
NetManager.TrainingRequest(buildData.dataMain.Id,curHeroId,1,function ()
|
||||
self:Refresh()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.UI.OnUpdateData)
|
||||
end)
|
||||
end)
|
||||
Util.AddOnceClick(self.btn_end,function ()
|
||||
if buildData.heroId and buildData.heroId~="" then
|
||||
NetManager.TrainingRequest(buildData.dataMain.Id,buildData.heroId,2,function ()
|
||||
curHeroId=nil
|
||||
self:Refresh()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.UI.OnUpdateData)
|
||||
end)
|
||||
end
|
||||
end)
|
||||
|
||||
|
||||
--帮助按钮
|
||||
Util.AddClick(self.helpBtn, function()
|
||||
LogError("点击帮助按钮")
|
||||
|
|
@ -102,11 +76,12 @@ end
|
|||
|
||||
|
||||
|
||||
function this:OnOpen(_data,_leftTime)
|
||||
function this:OnOpen(_data,_openPanel)
|
||||
openPanel=_openPanel
|
||||
buildData=_data
|
||||
self.title.text=buildData.dataMain.Name
|
||||
self.infoTxt.text=buildData.dataMain.Name.."每分钟增加"..buildData.dataSingle.Gain.."修炼经验"
|
||||
leftTime=_leftTime
|
||||
--leftTime=_leftTime
|
||||
curHeroId=buildData.heroId
|
||||
--LogError("buildData.dataMain.Id==="..buildData.dataMain.Id)
|
||||
end
|
||||
|
|
@ -183,17 +158,10 @@ function this:SetUpHero()
|
|||
end
|
||||
|
||||
function this:SetHeroList(isTop,isAni)
|
||||
local heroList = TrainBuildManager.GetAllCanTrainHero()
|
||||
local list={}
|
||||
curSelectObj=nil
|
||||
--LogError("buildData.heroId======="..buildData.heroId)
|
||||
local upList=TrainBuildManager.GetTrainHeroIds()
|
||||
for k, v in pairs(heroList) do
|
||||
if CheckListIsContainValue1(upList,v.dynamicId)==false or v.dynamicId==buildData.heroId then
|
||||
table.insert(list,v)
|
||||
end
|
||||
end
|
||||
self.noneObj:SetActive(#list==0)
|
||||
LogError("buildData.dataMain.id=============================="..buildData.dataSingle.Id)
|
||||
list=buildData.dataSingle.SpeedUp
|
||||
LogError("list len=================="..#list)
|
||||
self.scrollView:SetData(list, function (index, item)
|
||||
this:ShowSingleHero(item, list[index],index)
|
||||
end,not isTop,not isAni)
|
||||
|
|
@ -234,56 +202,59 @@ end
|
|||
|
||||
|
||||
function this:ShowSingleHero(go,data,index)
|
||||
local heroData = data.heroConfig
|
||||
Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetBgByHeroNatural(heroData.Natural))
|
||||
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.Icon))
|
||||
Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
|
||||
Util.GetGameObject(go, "name"):GetComponent("Text").text = heroData.ReadingName
|
||||
Util.GetGameObject(go, "choosed/Text"):GetComponent("Text").text="修炼中"
|
||||
Util.GetGameObject(go, "lvBg/lv"):GetComponent("Text").text = data.lv
|
||||
local trainLv=Util.GetGameObject(go, "trainLvBg/Text"):GetComponent("Text")
|
||||
local trainObj=Util.GetGameObject(go, "trainLvBg")
|
||||
local choosed=Util.GetGameObject(go, "choosed")
|
||||
choosed:SetActive(curHeroId==data.dynamicId)
|
||||
if curHeroId==data.dynamicId then
|
||||
curSelectObj=choosed
|
||||
local itemId=data[1]
|
||||
local time=data[2]
|
||||
local itemData=itemConfig[itemId]
|
||||
Util.GetGameObject(go, "bg/frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetBgByHeroNatural(itemData.Quantity))
|
||||
Util.GetGameObject(go, "bg/icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetResourcePath(itemData.ResourceID))
|
||||
Util.GetGameObject(go, "bg/name"):GetComponent("Text").text = itemData.Name
|
||||
Util.GetGameObject(go, "bg/condition"):GetComponent("Text").text = itemData.ItemDescribe
|
||||
local numTxt=Util.GetGameObject(go, "bg/numTxt"):GetComponent("Text")
|
||||
local btn_up=Util.GetGameObject(go, "bg/btnGet")
|
||||
Util.GetGameObject(go, "bg/btnGet/get"):GetComponent("Text").text="加速"
|
||||
local num=BagManager.GetItemCountById(itemId)
|
||||
local aaa=0
|
||||
if num<=0 then
|
||||
Util.SetGray(btn_up,true)
|
||||
--num=string.format("<color=#FCF5D3FF>%s</color>",num)
|
||||
aaa=string.format("<color=#FF0011>%s</color>",num)
|
||||
else
|
||||
Util.SetGray(btn_up,false)
|
||||
aaa=num
|
||||
--num=string.format("<color=#FF0011>%s</color>",num)
|
||||
end
|
||||
local trainInfo=Util.GetGameObject(go, "trainLvBg")
|
||||
local trainLv=Util.GetGameObject(go, "trainLvBg/Text"):GetComponent("Text")
|
||||
trainObj:SetActive(data.HeroTraining.trainingLv>0)
|
||||
trainLv.text="修炼等级"..data.HeroTraining.trainingLv
|
||||
local starGrid = Util.GetGameObject(go, "star")
|
||||
SetHeroStars(self.spLoader,starGrid,data.star)
|
||||
Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1)
|
||||
Util.AddOnceClick(go,function()
|
||||
if buildData.heroId and buildData.heroId~="" then
|
||||
if data.dynamicId~=buildData.heroId then
|
||||
PopupTipPanel.ShowTip("请先为当前英雄结束修炼")
|
||||
return
|
||||
end
|
||||
if data.dynamicId==buildData.heroId then
|
||||
PopupTipPanel.ShowTip("当前英雄修炼中")
|
||||
return
|
||||
end
|
||||
numTxt.text="拥有数量:"..aaa
|
||||
Util.AddOnceClick(btn_up,function()
|
||||
if num<=0 then
|
||||
PopupTipPanel.ShowTip("道具不足")
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemId)
|
||||
return
|
||||
end
|
||||
|
||||
if curHeroId~=data.dynamicId then
|
||||
if curSelectObj then
|
||||
curSelectObj:SetActive(false)
|
||||
end
|
||||
curHeroId=data.dynamicId
|
||||
curSelectObj=choosed
|
||||
else
|
||||
curHeroId=nil
|
||||
curSelectObj=nil
|
||||
if leftTime<0 then
|
||||
PopupTipPanel.ShowTip("修炼已完成")
|
||||
return
|
||||
end
|
||||
choosed:SetActive(curHeroId==data.dynamicId)
|
||||
this:SetUpHero()
|
||||
if buildData.heroId==nil or buildData.heroId=="" then
|
||||
PopupTipPanel.ShowTip("请先选择英雄开始修炼")
|
||||
return
|
||||
end
|
||||
NetManager.TrainingPropSpeedRequest(buildData.dataMain.Id,itemId,1,buildData.heroId,function()
|
||||
PopupTipPanel.ShowTip("加速修炼成功")
|
||||
this:Refresh(true,false)
|
||||
isSpeed=true
|
||||
end)
|
||||
|
||||
end)
|
||||
end
|
||||
|
||||
function this:OnClose()
|
||||
|
||||
if isSpeed then
|
||||
openPanel:Refresh()
|
||||
local panel=UIManager.GetOpenPanel(UIName.TrainBuildPanel)
|
||||
if panel then
|
||||
panel:OnShow()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function this:OnDestroy()
|
||||
|
|
@ -296,6 +267,7 @@ function this:OnDestroy()
|
|||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
isSpeed=false
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -14,6 +14,7 @@ function this:InitComponent()
|
|||
self.btn_close = Util.GetGameObject(self.gameObject,"bg/btn_close")
|
||||
self.btn_star = Util.GetGameObject(self.gameObject,"bg/btn_star")
|
||||
self.btn_end = Util.GetGameObject(self.gameObject,"bg/btn_end")
|
||||
self.btn_speed = Util.GetGameObject(self.gameObject,"bg/speedUp")
|
||||
self.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
|
||||
self.scroll = Util.GetGameObject(self.gameObject,"selectList")
|
||||
self.itemPre = Util.GetGameObject(self.gameObject,"itemPre")
|
||||
|
|
@ -63,6 +64,16 @@ function this:BindEvent()
|
|||
--LogError("点击确定按钮")
|
||||
self:ClosePanel()
|
||||
end)
|
||||
|
||||
Util.AddOnceClick(self.btn_speed,function ()
|
||||
if buildData.heroId==nil or buildData.heroId=="" then
|
||||
PopupTipPanel.ShowTip("请先将神将开始特训")
|
||||
return
|
||||
end
|
||||
UIManager.OpenPanel(UIName.TrainHeroAddSpeedPanel,buildData,this)
|
||||
end)
|
||||
|
||||
|
||||
Util.AddOnceClick(self.btn_star,function ()
|
||||
if buildData.heroId and buildData.heroId~="" then
|
||||
PopupTipPanel.ShowTip("已有修炼英雄")
|
||||
|
|
|
|||
|
|
@ -8207,6 +8207,35 @@ function NetManager.MoneyBuyGiftRequest(_id,func)
|
|||
end)
|
||||
end
|
||||
|
||||
|
||||
--特训加速
|
||||
function NetManager.TrainingPropSpeedRequest(_type,_itemId,_num,_heroId,func)
|
||||
local data=HeroInfoProto_pb.TrainingPropSpeedRequest()
|
||||
data.archId= _type
|
||||
data.itemId=_itemId
|
||||
data.num=_num
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.TrainingPropSpeedRequest,MessageTypeProto_pb.TrainingPropSpeedResponse,msg,function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = HeroInfoProto_pb.TrainingResponse()
|
||||
msg:ParseFromString(data)
|
||||
if msg.training then
|
||||
HeroManager.SetHeroTraining(_heroId,msg.training)
|
||||
-- HeroPropManager.SetDirtyByType(_heroId,Hero_Prop_Type.Training)
|
||||
-- HeroPropManager.RefreshHeroProp(_heroId)
|
||||
-- local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
-- --获取新战力
|
||||
-- NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
||||
-- local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
-- LogError("oldWarPower=="..oldWarPower.." tempPower=="..tempPower)
|
||||
-- if oldWarPower ~= tempPower then
|
||||
-- UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
|
||||
-- end
|
||||
end
|
||||
TrainBuildManager.SetBuildInfo(msg.info)
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -485,6 +485,7 @@ function EveryDayGiftNew:RefreshOneKeyShow()
|
|||
end
|
||||
-- 计算现价
|
||||
local now = 0
|
||||
LogError("onKeyPackId==================="..onKeyPackId)
|
||||
now = now + MoneyUtil.GetMoney(ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,onKeyPackId).Price)
|
||||
|
||||
self.extarOneKeyprice2.text = Language[10582] .. string.format(MoneyUtil.GetMoneyUnitName(),ori)
|
||||
|
|
|
|||
Loading…
Reference in New Issue