数字游戏提交
parent
8a4637bfdf
commit
ec48abdb3b
|
@ -1558,6 +1558,7 @@ RectTransform:
|
|||
- {fileID: 2486659429813947250}
|
||||
- {fileID: 8890830334262707862}
|
||||
- {fileID: 758519615073335968}
|
||||
- {fileID: 6724564084982409929}
|
||||
m_Father: {fileID: 6278899851612589502}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -1767,6 +1768,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3796128936607705084
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8984713353256533613}
|
||||
- component: {fileID: 6126896944933682068}
|
||||
- component: {fileID: 3933751845345959391}
|
||||
m_Layer: 5
|
||||
m_Name: ImgBg
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8984713353256533613
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3796128936607705084}
|
||||
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: 8351768615340891631}
|
||||
m_RootOrder: 2
|
||||
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: 846, y: 447}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6126896944933682068
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3796128936607705084}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3933751845345959391
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3796128936607705084}
|
||||
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: 0
|
||||
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: 7429d662a4bbee149bbb0219b7b99490, 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 &3906519870652152929
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2950,6 +3025,80 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 21, y: -55}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &5614468078853907658
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2284130032619005669}
|
||||
- component: {fileID: 3907654038661765533}
|
||||
- component: {fileID: 8562681895672309856}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2284130032619005669
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5614468078853907658}
|
||||
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: 8351768615340891631}
|
||||
m_RootOrder: 3
|
||||
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: 57, y: -54}
|
||||
m_SizeDelta: {x: 305, y: 423}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3907654038661765533
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5614468078853907658}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8562681895672309856
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5614468078853907658}
|
||||
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: 0
|
||||
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: 19196943e264bb6458a7a80aaf57dfb1, 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 &5669951066384980921
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3408,6 +3557,45 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &5915387960132832667
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8351768615340891631}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &8351768615340891631
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5915387960132832667}
|
||||
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:
|
||||
- {fileID: 8163642493402846230}
|
||||
- {fileID: 566951695220913379}
|
||||
- {fileID: 8984713353256533613}
|
||||
- {fileID: 2284130032619005669}
|
||||
m_Father: {fileID: 6724564084982409929}
|
||||
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: 21, y: -55}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &6288326278471681729
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -4480,6 +4668,135 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &8805432937539332351
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6724564084982409929}
|
||||
- component: {fileID: 5880951222211970726}
|
||||
- component: {fileID: 1396106360097974358}
|
||||
- component: {fileID: 6180085343152526280}
|
||||
- component: {fileID: 2647545793291086598}
|
||||
m_Layer: 5
|
||||
m_Name: numGame
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6724564084982409929
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8805432937539332351}
|
||||
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:
|
||||
- {fileID: 8351768615340891631}
|
||||
m_Father: {fileID: 2111641511848696073}
|
||||
m_RootOrder: 12
|
||||
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: -239, y: -787}
|
||||
m_SizeDelta: {x: 609, y: 300}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5880951222211970726
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8805432937539332351}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1396106360097974358
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8805432937539332351}
|
||||
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: 3
|
||||
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: 2647545793291086598}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &6180085343152526280
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8805432937539332351}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!114 &2647545793291086598
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8805432937539332351}
|
||||
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 &8896427205265497543
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5167,6 +5484,31 @@ RectTransform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1129047560315073780}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1356731605991977282
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 8351768615340891631}
|
||||
m_Modifications:
|
||||
- target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 59
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -54
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: c1341787bb680534d92884d1358bc4e0, type: 3}
|
||||
--- !u!224 &8163642493402846230 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1356731605991977282}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1359458487507627116
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -6727,6 +7069,26 @@ RectTransform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 8215869480814164224}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &8550799179779472925
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 8351768615340891631}
|
||||
m_Modifications:
|
||||
- target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9d0416f0fe8e98e42b70235059e824df, type: 3}
|
||||
--- !u!224 &566951695220913379 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 8550799179779472925}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &8744449918922119930
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -750,6 +750,10 @@ GETCOMPARENUMINFORESPONSE = protobuf.Descriptor();
|
|||
GETCOMPARENUMINFORESPONSE_LEVELID_FIELD = protobuf.FieldDescriptor();
|
||||
GETCOMPARENUMINFORESPONSE_COMPLETENUM_FIELD = protobuf.FieldDescriptor();
|
||||
GETCOMPARENUMINFORESPONSE_REWARDIDARR_FIELD = protobuf.FieldDescriptor();
|
||||
GETCOMPARENUMINFORESPONSE_REWARDSTARTTIME_FIELD = protobuf.FieldDescriptor();
|
||||
COMPARENUMREWARDREQUEST = protobuf.Descriptor();
|
||||
COMPARENUMREWARDRESPONSE = protobuf.Descriptor();
|
||||
COMPARENUMREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
GMBUYGOODREQUEST = protobuf.Descriptor();
|
||||
GMBUYGOODREQUEST_GOODSID_FIELD = protobuf.FieldDescriptor();
|
||||
WEARFAXIANGEQUIPREQUEST = protobuf.Descriptor();
|
||||
|
@ -7652,13 +7656,48 @@ GETCOMPARENUMINFORESPONSE_REWARDIDARR_FIELD.default_value = {}
|
|||
GETCOMPARENUMINFORESPONSE_REWARDIDARR_FIELD.type = 5
|
||||
GETCOMPARENUMINFORESPONSE_REWARDIDARR_FIELD.cpp_type = 1
|
||||
|
||||
GETCOMPARENUMINFORESPONSE_REWARDSTARTTIME_FIELD.name = "rewardStartTime"
|
||||
GETCOMPARENUMINFORESPONSE_REWARDSTARTTIME_FIELD.full_name = ".rpc.protocols.GetCompareNumInfoResponse.rewardStartTime"
|
||||
GETCOMPARENUMINFORESPONSE_REWARDSTARTTIME_FIELD.number = 4
|
||||
GETCOMPARENUMINFORESPONSE_REWARDSTARTTIME_FIELD.index = 3
|
||||
GETCOMPARENUMINFORESPONSE_REWARDSTARTTIME_FIELD.label = 1
|
||||
GETCOMPARENUMINFORESPONSE_REWARDSTARTTIME_FIELD.has_default_value = false
|
||||
GETCOMPARENUMINFORESPONSE_REWARDSTARTTIME_FIELD.default_value = 0
|
||||
GETCOMPARENUMINFORESPONSE_REWARDSTARTTIME_FIELD.type = 5
|
||||
GETCOMPARENUMINFORESPONSE_REWARDSTARTTIME_FIELD.cpp_type = 1
|
||||
|
||||
GETCOMPARENUMINFORESPONSE.name = "GetCompareNumInfoResponse"
|
||||
GETCOMPARENUMINFORESPONSE.full_name = ".rpc.protocols.GetCompareNumInfoResponse"
|
||||
GETCOMPARENUMINFORESPONSE.nested_types = {}
|
||||
GETCOMPARENUMINFORESPONSE.enum_types = {}
|
||||
GETCOMPARENUMINFORESPONSE.fields = {GETCOMPARENUMINFORESPONSE_LEVELID_FIELD, GETCOMPARENUMINFORESPONSE_COMPLETENUM_FIELD, GETCOMPARENUMINFORESPONSE_REWARDIDARR_FIELD}
|
||||
GETCOMPARENUMINFORESPONSE.fields = {GETCOMPARENUMINFORESPONSE_LEVELID_FIELD, GETCOMPARENUMINFORESPONSE_COMPLETENUM_FIELD, GETCOMPARENUMINFORESPONSE_REWARDIDARR_FIELD, GETCOMPARENUMINFORESPONSE_REWARDSTARTTIME_FIELD}
|
||||
GETCOMPARENUMINFORESPONSE.is_extendable = false
|
||||
GETCOMPARENUMINFORESPONSE.extensions = {}
|
||||
COMPARENUMREWARDREQUEST.name = "CompareNumRewardRequest"
|
||||
COMPARENUMREWARDREQUEST.full_name = ".rpc.protocols.CompareNumRewardRequest"
|
||||
COMPARENUMREWARDREQUEST.nested_types = {}
|
||||
COMPARENUMREWARDREQUEST.enum_types = {}
|
||||
COMPARENUMREWARDREQUEST.fields = {}
|
||||
COMPARENUMREWARDREQUEST.is_extendable = false
|
||||
COMPARENUMREWARDREQUEST.extensions = {}
|
||||
COMPARENUMREWARDRESPONSE_DROP_FIELD.name = "drop"
|
||||
COMPARENUMREWARDRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.CompareNumRewardResponse.drop"
|
||||
COMPARENUMREWARDRESPONSE_DROP_FIELD.number = 1
|
||||
COMPARENUMREWARDRESPONSE_DROP_FIELD.index = 0
|
||||
COMPARENUMREWARDRESPONSE_DROP_FIELD.label = 1
|
||||
COMPARENUMREWARDRESPONSE_DROP_FIELD.has_default_value = false
|
||||
COMPARENUMREWARDRESPONSE_DROP_FIELD.default_value = nil
|
||||
COMPARENUMREWARDRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
|
||||
COMPARENUMREWARDRESPONSE_DROP_FIELD.type = 11
|
||||
COMPARENUMREWARDRESPONSE_DROP_FIELD.cpp_type = 10
|
||||
|
||||
COMPARENUMREWARDRESPONSE.name = "CompareNumRewardResponse"
|
||||
COMPARENUMREWARDRESPONSE.full_name = ".rpc.protocols.CompareNumRewardResponse"
|
||||
COMPARENUMREWARDRESPONSE.nested_types = {}
|
||||
COMPARENUMREWARDRESPONSE.enum_types = {}
|
||||
COMPARENUMREWARDRESPONSE.fields = {COMPARENUMREWARDRESPONSE_DROP_FIELD}
|
||||
COMPARENUMREWARDRESPONSE.is_extendable = false
|
||||
COMPARENUMREWARDRESPONSE.extensions = {}
|
||||
GMBUYGOODREQUEST_GOODSID_FIELD.name = "goodsId"
|
||||
GMBUYGOODREQUEST_GOODSID_FIELD.full_name = ".rpc.protocols.GmBuyGoodRequest.goodsId"
|
||||
GMBUYGOODREQUEST_GOODSID_FIELD.number = 1
|
||||
|
@ -8277,6 +8316,8 @@ CompareNumEndGameRequest = protobuf.Message(COMPARENUMENDGAMEREQUEST)
|
|||
CompareNumEndGameResponse = protobuf.Message(COMPARENUMENDGAMERESPONSE)
|
||||
CompareNumInfoRequest = protobuf.Message(COMPARENUMINFOREQUEST)
|
||||
CompareNumInfoResponse = protobuf.Message(COMPARENUMINFORESPONSE)
|
||||
CompareNumRewardRequest = protobuf.Message(COMPARENUMREWARDREQUEST)
|
||||
CompareNumRewardResponse = protobuf.Message(COMPARENUMREWARDRESPONSE)
|
||||
CookFoodRequest = protobuf.Message(COOKFOODREQUEST)
|
||||
CookFoodResponse = protobuf.Message(COOKFOODRESPONSE)
|
||||
DailyChallengeRequest = protobuf.Message(DAILYCHALLENGEREQUEST)
|
||||
|
|
|
@ -101,6 +101,15 @@ local carbonData = {
|
|||
effect1 = "Fx_XuanYuanBaoJing",
|
||||
effect2 = "Fx_XuanYuanBaoJing_S",
|
||||
},
|
||||
[FUNCTION_OPEN_TYPE.Number_Game] = {
|
||||
id = FUNCTION_OPEN_TYPE.Number_Game, --数字游戏
|
||||
objName = "numGame",
|
||||
nameImg = "f_fuben_fubenming_08",
|
||||
btnPos = Vector2(-20,70),
|
||||
redPointType = RedPointType.numberGame,
|
||||
effect1 = "Fx_SenLuoHuanJjing",
|
||||
effect2 = "Fx_SenLuoHuanJjing_S",
|
||||
},
|
||||
}
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
|
@ -507,6 +516,10 @@ function CarbonsPanel:BtnClick(id)
|
|||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(id))
|
||||
end
|
||||
elseif id==FUNCTION_OPEN_TYPE.Number_Game then
|
||||
NetManager.GetComparenumInfoRequest(function()
|
||||
UIManager.OpenPanel(UIName.RatioNumberLevelPanel)
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
|
|
|
@ -191,8 +191,9 @@ function FightPointPassMainPanel:InitComponent()
|
|||
this.funcBtnList[FUNCTION_OPEN_TYPE.XiaoYaoYou] = this.btnXiaoYao
|
||||
--数字游戏按钮
|
||||
this.numberGameBtn=Util.GetGameObject(self.gameObject,"Bg/RightUpVertical/numberGameBtn")
|
||||
this.numberGameBtn:SetActive(false)
|
||||
this.numberGameRed=Util.GetGameObject(self.gameObject,"Bg/RightUpVertical/numberGameBtn/redPoint")
|
||||
this.funcBtnList[FUNCTION_OPEN_TYPE.Number_Game] = this.numberGameBtn
|
||||
--this.funcBtnList[FUNCTION_OPEN_TYPE.Number_Game] = this.numberGameBtn
|
||||
--解锁功能
|
||||
this.openFun = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/openFun")
|
||||
this.openFunNeedInfo = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/openFun/needInfo"):GetComponent("Text")
|
||||
|
@ -475,7 +476,7 @@ function FightPointPassMainPanel:BindEvent()
|
|||
--BindRedPointObject(RedPointType.SecretTer_IsCanFight, this.fightRP)
|
||||
BindRedPointObject(RedPointType.XiaoYaoYouRedPoint, this.xiaoyaoRedPoint)
|
||||
BindRedPointObject(RedPointType.FirstRecharge, this.firstRedPoint)
|
||||
BindRedPointObject(RedPointType.numberGame, this.numberGameRed)
|
||||
--BindRedPointObject(RedPointType.numberGame, this.numberGameRed)
|
||||
BindRedPointObject(RedPointType.tuijianzhenrong, this.milkRed)
|
||||
-- BindRedPointObject(RedPointType.FightLevel, this.btnFightLevelRedPoint)
|
||||
end
|
||||
|
@ -785,9 +786,10 @@ function this.BattleLogic()
|
|||
--for i=1,5 do
|
||||
local power=HeroPowerManager.GetHeroPower(this.heroList[i].data.dynamicId, FormationTypeDef.FORMATION_NORMAL)
|
||||
--LogError("power===================================================="..power)
|
||||
bossHp=bossHp - math.floor(power*(1+SmallSoldierManager.soliderAdd/100)+0.5)
|
||||
allAttacck=allAttacck+math.floor(power*(1+SmallSoldierManager.soliderAdd/100)+0.5)
|
||||
this.Floater:ArtFloatingOnHook(ArtFloatingType.Damage,ArtFloatingColor.White,power)
|
||||
local heroPower=math.floor(power*(1+SmallSoldierManager.soliderAdd/100)+0.5)
|
||||
bossHp=bossHp - heroPower
|
||||
allAttacck=allAttacck+heroPower
|
||||
this.Floater:ArtFloatingOnHook(ArtFloatingType.Damage,ArtFloatingColor.White,heroPower)
|
||||
|
||||
--end
|
||||
isHit=true
|
||||
|
|
|
@ -8152,4 +8152,20 @@ function NetManager.QueryLuofuRegisterInfoRequest(_func)
|
|||
end)
|
||||
end
|
||||
|
||||
--比数字小游戏挂机奖励
|
||||
function NetManager.CompareNumRewardRequest(_func)
|
||||
local data=PlayerInfoProto_pb.CompareNumRewardRequest()
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.CompareNumRewardRequest,MessageTypeProto_pb.CompareNumRewardResponse,msg,function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = PlayerInfoProto_pb.CompareNumRewardResponse()
|
||||
msg:ParseFromString(data)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1)
|
||||
if _func then
|
||||
_func()
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
return this
|
|
@ -4,7 +4,8 @@ local this = RatioNumberLevelPanel
|
|||
local sortingOrder = 0
|
||||
local boxList = {}
|
||||
local levelList = {}
|
||||
|
||||
local SpecialConfig= ConfigManager.GetConfigData(ConfigName.SpecialConfig,184)
|
||||
local maxTime=tonumber(SpecialConfig.Value)*60
|
||||
local chapterId = 0
|
||||
local chapterData = {}
|
||||
local allMissionDailyBoxItemPres = {}
|
||||
|
@ -59,14 +60,38 @@ function RatioNumberLevelPanel:InitComponent()
|
|||
this.titleImg = Util.GetGameObject(self.gameObject,"title"):GetComponent("Image")
|
||||
this.btn_help = Util.GetGameObject(self.gameObject,"btn_help")
|
||||
this.helpPosition= this.btn_help:GetComponent("RectTransform").localPosition
|
||||
|
||||
this.rewardList = {}
|
||||
this.rewardItemPre= Util.GetGameObject(self.gameObject, "rewardContent/item")
|
||||
this.rewardGrid =Util.GetGameObject(self.gameObject, "rewardContent")
|
||||
this.rewardTxt= Util.GetGameObject(self.gameObject, "getBoxReward/time/Text"):GetComponent("Text")
|
||||
this.rewardRed= Util.GetGameObject(self.gameObject, "getBoxReward/rewardBoxRedPoint")
|
||||
this.btn_reward=Util.GetGameObject(self.gameObject, "getBoxReward")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function RatioNumberLevelPanel:BindEvent()
|
||||
|
||||
|
||||
|
||||
Util.AddClick(this.btn_reward, function ()
|
||||
if RatioNumberManager.gameIndex==0 then
|
||||
PopupTipPanel.ShowTip("至少通关一层才可领取挂机奖励")
|
||||
return
|
||||
end
|
||||
LogError("GetTimeStamp()=="..GetTimeStamp().." showTime=="..RatioNumberManager.rewardStartTime)
|
||||
if GetTimeStamp()-RatioNumberManager.rewardStartTime<360 then
|
||||
PopupTipPanel.ShowTip("累计挂机奖励中")
|
||||
return
|
||||
end
|
||||
NetManager.CompareNumRewardRequest(function()
|
||||
RatioNumberManager.rewardStartTime=GetTimeStamp()
|
||||
this.GetBoxShowState(GetTimeStamp())
|
||||
end)
|
||||
end)
|
||||
Util.AddOnceClick(self.btnBack, function()
|
||||
self:ClosePanel()
|
||||
UIManager.OpenPanel(UIName.FightPointPassMainPanel)
|
||||
UIManager.OpenPanel(UIName.CarbonsPanel)
|
||||
end)
|
||||
Util.AddOnceClick(this.btn_help, function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup,131,this.helpPosition.x,this.helpPosition.y)
|
||||
|
@ -101,6 +126,43 @@ function RatioNumberLevelPanel:OnOpen()
|
|||
-- this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
function this.IntiReward()
|
||||
local rewardData
|
||||
|
||||
local config=ConfigManager.GetConfigData(ConfigName.CompareNumSetting,RatioNumberManager.gameIndex)
|
||||
rewardData = config.Income
|
||||
for i = 1, #rewardData do
|
||||
if not this.rewardList[i] then
|
||||
local go = {}
|
||||
go.item = newObjToParent(this.rewardItemPre, this.rewardGrid)
|
||||
go.icon = Util.GetGameObject(go.item, "iconBg/icon"):GetComponent("Image")
|
||||
go.text = Util.GetGameObject(go.item, "rewardbg/context"):GetComponent("Text")
|
||||
go.infoTxt=Util.GetGameObject(go.item, "rewardbg/rate"):GetComponent("Text")
|
||||
--go.infoTxt.gameObject:SetActive(false)
|
||||
this.rewardList[i] = go
|
||||
end
|
||||
|
||||
this.rewardList[i].icon.sprite = SetIcon(this.spLoader, rewardData[i][1])
|
||||
|
||||
local addValue =0 --FightPointPassManager.GetItemVipValue(rewardData[i][1])
|
||||
local baseValue = rewardData[i][2]
|
||||
this.rewardList[i].infoTxt.text=string.format("/%s分钟",config.IncomeTime)
|
||||
if addValue - 1 <= 0 then
|
||||
this.rewardList[i].text.text = "+"..rewardData[i][2] --..string.format("/%s分钟",config.IncomeTime)
|
||||
else
|
||||
local valueShow = math.round((addValue - 1) * baseValue)
|
||||
this.rewardList[i].text.text = string.format("+%s\n<color=#1CC853>(+%s)</color>",baseValue,valueShow)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function RatioNumberLevelPanel:OnShow()
|
||||
|
||||
|
@ -128,9 +190,47 @@ function RatioNumberLevelPanel:OnShow()
|
|||
-- this.OnShowPanel()
|
||||
-- this.LeftOrRightBtnClickEvent()
|
||||
this.rewardMaskBtn:SetActive(false)
|
||||
|
||||
this.IntiReward()
|
||||
LogError("RatioNumberManager.rewardStartTime=="..RatioNumberManager.rewardStartTime)
|
||||
local showTime=RatioNumberManager.rewardStartTime
|
||||
this.GetBoxShowState(showTime)
|
||||
end
|
||||
|
||||
|
||||
function this.GetBoxShowState(hangupTime)
|
||||
LogError("挂机时长 hangupTime " .. hangupTime)
|
||||
if RatioNumberManager.gameIndex==0 then
|
||||
this.rewardTxt.text = TimeToHM(0)
|
||||
return 0
|
||||
end
|
||||
local state = 0
|
||||
local curTime=GetTimeStamp()
|
||||
LogError("curTime=========="..curTime.." hangupTime== "..hangupTime)
|
||||
local addTime=curTime-hangupTime
|
||||
if addTime>maxTime then
|
||||
hangupTime=maxTime
|
||||
else
|
||||
hangupTime=addTime
|
||||
end
|
||||
LogError("hangupTime==========================="..hangupTime)
|
||||
if hangupTime < AdventureManager.adventureRefresh then
|
||||
state = 0
|
||||
elseif hangupTime >= AdventureManager.adventureRefresh and hangupTime < AdventureManager.adventureBoxShow[1] then
|
||||
state = 1
|
||||
elseif hangupTime >= AdventureManager.adventureRefresh and hangupTime < AdventureManager.adventureBoxShow[2] then
|
||||
state = 2
|
||||
else
|
||||
state = 3
|
||||
end
|
||||
|
||||
if hangupTime < 0 then
|
||||
hangupTime = 0
|
||||
end
|
||||
this.rewardTxt.text = TimeToHM(hangupTime)
|
||||
return state
|
||||
end
|
||||
|
||||
|
||||
--1---------------------------------
|
||||
function this.LevelShowHandle()
|
||||
local chapter = RatioNumberLevelManager.GetChapterInfo(chapterId)
|
||||
|
|
|
@ -19,6 +19,7 @@ this.enemyBuildId = 0
|
|||
this.palyerBuildId = 0
|
||||
this.gameIndex = 1
|
||||
this.protagonist = nil
|
||||
this.rewardStartTime = 0
|
||||
|
||||
this.playerResStr = {
|
||||
[1] = 8001670, --背景
|
||||
|
@ -45,6 +46,10 @@ function RatioNumberManager.Init(msg)
|
|||
this.chapterId =this.chapterId + 1
|
||||
end
|
||||
this.rewardIdArr = msg.rewardIdArr
|
||||
if msg.rewardStartTime then
|
||||
this.rewardStartTime = msg.rewardStartTime
|
||||
end
|
||||
|
||||
RatioNumberManager.SelectInit()
|
||||
--LogError("num==="..num.." this.chapterId=="..this.chapterId.." this.levelId=="..this.levelId)
|
||||
end
|
||||
|
|
|
@ -128,6 +128,7 @@ function this:OnOpen(_fun)
|
|||
fun = _fun
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_mrhl)
|
||||
LogError("11111111111111111111111111111111111111111111111111111111111")
|
||||
end
|
||||
|
||||
--获取(自己拼凑)礼包数据
|
||||
|
|
Loading…
Reference in New Issue