Skip to content

W
wdlc_mjb_unity
Commit 00fdfb04 authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

双倍领取逻辑完善

parent 3af2b5d8
Hide whitespace changes
Inline Side-by-side
Showing with 240 additions and 175 deletions
Assets/Game/Main/Resource/ui/WithdrawEveryDay.meta 0 → 100644
View file @ 00fdfb04
fileFormatVersion: 2
guid: c8769dd604faf4fb9b727d8d2fe57934
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ 00fdfb04
......@@ -1152,7 +1152,7 @@ PrefabInstance:
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -1162,27 +1162,27 @@ PrefabInstance:
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 88
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 22
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 74
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -1192,7 +1192,7 @@ PrefabInstance:
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -1202,27 +1202,27 @@ PrefabInstance:
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 26
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 12.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2730660779215313333, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -1270,12 +1270,12 @@ PrefabInstance:
- target: {fileID: 8590918432191769279, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 118
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8590918432191769279, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 26
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db026780330de104d920b4c604141362, type: 3}
......@@ -2615,10 +2615,10 @@ RectTransform:
m_Father: {fileID: 2116027664}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 360.5, y: -667.5}
m_SizeDelta: {x: 711, y: 971}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &88989133
MonoBehaviour:
......@@ -4234,8 +4234,6 @@ RectTransform:
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 16, y: -0.000005161645}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 16, y: -0.000011011958}
m_SizeDelta: {x: -20.000061, y: 1031}
m_Pivot: {x: 0, y: 1}
--- !u!114 &133138106
MonoBehaviour:
......@@ -5837,9 +5835,9 @@ RectTransform:
m_Father: {fileID: 88989132}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 358.91553, y: -169.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 677.83105, y: 113}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &207636952
......@@ -6962,9 +6960,9 @@ RectTransform:
m_Father: {fileID: 88989132}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 358.91553, y: -282.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 677.83105, y: 113}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &236465178
......@@ -9109,14 +9107,10 @@ RectTransform:
m_Father: {fileID: 1548415916}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 355, y: 0}
m_SizeDelta: {x: 710, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 355, y: -72.5}
m_SizeDelta: {x: 710, y: 145}
m_SizeDelta: {x: 710, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &300181110
MonoBehaviour:
......@@ -10500,9 +10494,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -17, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &339313292
MonoBehaviour:
......@@ -11086,7 +11080,7 @@ PrefabInstance:
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -11096,27 +11090,27 @@ PrefabInstance:
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 88
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 22
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 74
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -11126,7 +11120,7 @@ PrefabInstance:
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -11136,27 +11130,27 @@ PrefabInstance:
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 26
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 12.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2730660779215313333, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -11204,12 +11198,12 @@ PrefabInstance:
- target: {fileID: 8590918432191769279, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 118
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8590918432191769279, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 26
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db026780330de104d920b4c604141362, type: 3}
......@@ -13142,10 +13136,10 @@ RectTransform:
m_Father: {fileID: 300181109}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 110, y: -50}
m_SizeDelta: {x: 160, y: 40}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &409306806
MonoBehaviour:
......@@ -15293,7 +15287,6 @@ GameObject:
- component: {fileID: 479268149}
- component: {fileID: 479268152}
- component: {fileID: 479268151}
- component: {fileID: 479268150}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
......@@ -16818,7 +16811,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.00055163977}
m_SizeDelta: {x: -698, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &508766706
MonoBehaviour:
......@@ -24535,10 +24528,10 @@ RectTransform:
m_Father: {fileID: 133138105}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 355.5, y: -110.5}
m_SizeDelta: {x: 711, y: 167}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &772015006
MonoBehaviour:
......@@ -25483,10 +25476,10 @@ RectTransform:
m_Father: {fileID: 133138105}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -269}
m_SizeDelta: {x: 0, y: 114}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &817584554
MonoBehaviour:
......@@ -31515,9 +31508,9 @@ RectTransform:
m_Father: {fileID: 88989132}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 358.91553, y: -395.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 677.83105, y: 113}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1034623334
......@@ -33720,7 +33713,18 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1106559221}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 2052625161}
m_MethodName: closeNewHappyGetDialog
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1106559221
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -35492,7 +35496,7 @@ PrefabInstance:
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -35502,27 +35506,27 @@ PrefabInstance:
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 88
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 22
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 74
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -35532,7 +35536,7 @@ PrefabInstance:
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -35542,27 +35546,27 @@ PrefabInstance:
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 26
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 12.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2730660779215313333, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -35610,12 +35614,12 @@ PrefabInstance:
- target: {fileID: 8590918432191769279, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 118
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8590918432191769279, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 26
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db026780330de104d920b4c604141362, type: 3}
......@@ -35660,9 +35664,9 @@ RectTransform:
m_Father: {fileID: 1383247115}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 355, y: -135}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 710, y: 270}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1174983029
......@@ -36071,10 +36075,10 @@ RectTransform:
m_Father: {fileID: 2116027664}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 360.5, y: -83.5}
m_SizeDelta: {x: 711, y: 167}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1195034275
MonoBehaviour:
......@@ -39013,7 +39017,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 716, y: 120}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1286803940
MonoBehaviour:
......@@ -39663,7 +39667,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -708.00006, y: 30}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1298650611
MonoBehaviour:
......@@ -40678,7 +40682,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2052625161}
m_MethodName: closeHappyGetDialog
m_MethodName: closeNewHappyGetDialog
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
......@@ -42278,10 +42282,10 @@ RectTransform:
m_Father: {fileID: 133138105}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 355.5, y: -479}
m_SizeDelta: {x: 711, y: 270}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1383247116
MonoBehaviour:
......@@ -44151,7 +44155,7 @@ PrefabInstance:
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -44161,27 +44165,27 @@ PrefabInstance:
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 88
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 22
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 74
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -44191,7 +44195,7 @@ PrefabInstance:
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -44201,27 +44205,27 @@ PrefabInstance:
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 26
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 12.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2730660779215313333, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -44269,12 +44273,12 @@ PrefabInstance:
- target: {fileID: 8590918432191769279, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 118
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8590918432191769279, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 26
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db026780330de104d920b4c604141362, type: 3}
......@@ -46611,9 +46615,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -17, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1538153855
MonoBehaviour:
......@@ -47272,10 +47276,10 @@ RectTransform:
m_Father: {fileID: 133138105}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 355.5, y: -831.5}
m_SizeDelta: {x: 711, y: 399}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1548415917
MonoBehaviour:
......@@ -48758,7 +48762,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2052625161}
m_MethodName: closeHappyGetDialog
m_MethodName: doubleGetReceive
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
......@@ -50777,9 +50781,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -17, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1645377759
MonoBehaviour:
......@@ -53540,9 +53544,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -17, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1731803571
MonoBehaviour:
......@@ -54152,7 +54156,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.00055163977}
m_SizeDelta: {x: -40, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!1 &1754124953
GameObject:
......@@ -54439,7 +54443,7 @@ PrefabInstance:
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -54449,27 +54453,27 @@ PrefabInstance:
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 88
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 22
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 74
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -54479,7 +54483,7 @@ PrefabInstance:
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -54489,27 +54493,27 @@ PrefabInstance:
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 26
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 12.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2730660779215313333, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -54557,12 +54561,12 @@ PrefabInstance:
- target: {fileID: 8590918432191769279, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 118
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8590918432191769279, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 26
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db026780330de104d920b4c604141362, type: 3}
......@@ -54849,9 +54853,9 @@ RectTransform:
m_Father: {fileID: 88989132}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 358.91553, y: -56.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 677.83105, y: 113}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1764768710
......@@ -57371,10 +57375,10 @@ RectTransform:
m_Father: {fileID: 300181109}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 30, y: -102.5}
m_SizeDelta: {x: 0, y: 25}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1853878469
MonoBehaviour:
......@@ -61762,9 +61766,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -17, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2026348620
MonoBehaviour:
......@@ -64560,7 +64564,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.00030517578}
m_SizeDelta: {x: -7.000061, y: 1153}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2116027665
MonoBehaviour:
......@@ -66067,7 +66071,7 @@ PrefabInstance:
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -66077,27 +66081,27 @@ PrefabInstance:
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 88
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 22
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 74
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2147821956871427290, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -66107,7 +66111,7 @@ PrefabInstance:
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -66117,27 +66121,27 @@ PrefabInstance:
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 26
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 12.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2295207268914503973, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2453852615608902663, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -66182,12 +66186,12 @@ PrefabInstance:
- target: {fileID: 8590918432191769279, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.x
value: 118
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8590918432191769279, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_SizeDelta.y
value: 26
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: db026780330de104d920b4c604141362, type: 3}
Assets/Game/Main/Scripts/Model/BoxReceiveBean.cs
View file @ 00fdfb04
......@@ -6,4 +6,5 @@ public class BoxReceiveBean
public int currencyType;
public double cash;
public string currencyTypeEnum;
public string sid;
}
Assets/Game/Main/Scripts/Model/DoubleReceiveBean.cs 0 → 100644
View file @ 00fdfb04
using System;
public class DoubleReceiveBean
{
public int recode;
public string msg;
}
Assets/Game/Main/Scripts/Model/DoubleReceiveBean.cs.meta 0 → 100644
View file @ 00fdfb04
fileFormatVersion: 2
guid: 6dce42d57e906427f9aa1f888d8d75d3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scripts/Utils/Guide.cs
View file @ 00fdfb04
......@@ -87,6 +87,7 @@ public class Guide : MonoBehaviour
public void showGuide(bool isUser)
{
//isUser = true;
if (isStartShow)
{
return;
......
Assets/Game/Main/Scripts/View/DialogControl.cs
View file @ 00fdfb04
......@@ -230,7 +230,7 @@ public class DialogControl : MonoBehaviour
{
if (cb)
{
HttpTool.Instance._Post("app/v1/game/fkqcw/doubling/incr_time_by_video", parm, new Action<VideoStatusBean>((bean) =>
HttpTool.Instance._Post("app/v1/game/fkqcw/doubling/incr_time_by_video", null, new Action<VideoStatusBean>((bean) =>
{
EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
}), new Action<string, string>((code, errMsg) =>
......@@ -458,7 +458,7 @@ public class DialogControl : MonoBehaviour
AudioUtils.ins.PlayBtnAudio();
if (PlayerDataControl.Instance.pigStatus == 1) {
HttpTool.Instance._Post("app/v1/wdlc/reward/receive_piggy_bank", parm, new Action<RewardData>((bean) =>
HttpTool.Instance._Post("app/v1/wdlc/reward/receive_piggy_bank", null, new Action<RewardData>((bean) =>
{
closePigBankDialog();
//showHappyGetDialog(PlayerDataControl.Instance.pigNum + "元");
......@@ -490,7 +490,7 @@ public class DialogControl : MonoBehaviour
Invoke("moveDiamondDialog", 1f);
//#endif
HttpTool.Instance._Get("app/v2/cscmnq/diamond_by_video_status", parm, new Action<DiamondStatusBean>((bean) =>
HttpTool.Instance._Get("app/v2/cscmnq/diamond_by_video_status", null, new Action<DiamondStatusBean>((bean) =>
{
DiamondplayNum = bean.playNum;
DiamondRewardNum = bean.rewardDiamondNum;
......@@ -745,6 +745,7 @@ public class DialogControl : MonoBehaviour
AudioUtils.ins.PlayBtnAudio();
getRedPackDialog.SetActive(false);
}
private string sid;
public void getVideoReward(int type)
{
AudioUtils.ins.PlayBtnAudio();
......@@ -763,7 +764,8 @@ public class DialogControl : MonoBehaviour
if (bean.currencyType == 10)
{
//
showHappyGetDialog(bean.cash.ToString());
sid = bean.sid;
showNewHappyGetDialog(bean.cash.ToString());
}
else
{
......@@ -840,7 +842,38 @@ public class DialogControl : MonoBehaviour
//关闭带双倍领取的开心收下弹窗
public void closeNewHappyGetDialog()
{
AudioUtils.ins.PlayBtnAudio();
newhappygetDialog.SetActive(false);
EventCenter.Broadcast(MyEventType.FlyHongbao);
EventCenter.Broadcast(MyEventType.RefreshHomeInfo);
}
//双倍领取
public void doubleGetReceive()
{
AudioUtils.ins.PlayBtnAudio();
newhappygetDialog.SetActive(false);
parm.Clear();
parm["sid"] = sid;
AdUtils.PlayRewardAd("double_reward", new Action<bool>((cb) =>
{
if (cb)
{
HttpTool.Instance._Post("app/v3/common/award/multiple", parm, new Action<DoubleReceiveBean>((bean) =>
{
if (bean.recode == 1)
{
EventCenter.Broadcast(MyEventType.FlyHongbao);
EventCenter.Broadcast(MyEventType.RefreshHomeInfo);
}
}), new Action<string, string>((code, errMsg) =>
{
Debug.unityLogger.Log("双倍奖励 请求失败" + code + errMsg);
}));
}
}));
}
//展示钻石奖励弹窗
......@@ -977,7 +1010,8 @@ public class DialogControl : MonoBehaviour
if (bean.currencyType == 10)
{
//
showHappyGetDialog(bean.cash.ToString());
sid = bean.sid;
showNewHappyGetDialog(bean.cash.ToString());
}
else
{
......
Packages/packages-lock.json
View file @ 00fdfb04
......@@ -19,7 +19,7 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.analytics": {
"version": "3.3.5",
......@@ -28,21 +28,21 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.collab-proxy": {
"version": "1.2.16",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.ide.rider": {
"version": "1.1.4",
......@@ -51,14 +51,14 @@
"dependencies": {
"com.unity.test-framework": "1.1.1"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.ide.vscode": {
"version": "1.2.3",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.multiplayer-hlapi": {
"version": "1.0.8",
......@@ -67,7 +67,7 @@
"dependencies": {
"nuget.mono-cecil": "0.1.6-preview"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.purchasing": {
"version": "2.2.1",
......@@ -76,7 +76,7 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.test-framework": {
"version": "1.1.20",
......@@ -87,7 +87,7 @@
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.textmeshpro": {
"version": "2.1.1",
......@@ -96,14 +96,14 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.timeline": {
"version": "1.2.17",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.ugui": {
"version": "1.0.0",
......@@ -122,14 +122,14 @@
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"nuget.mono-cecil": {
"version": "0.1.6-preview",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.modules.ai": {
"version": "1.0.0",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment