Skip to content

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

修改迭代需求

parent f97422aa
Hide whitespace changes
Inline Side-by-side
Showing with 1001 additions and 77 deletions
Assets/Game/Main/Resource/ui/dialog/plantTree/提示语.png.meta → Assets/Game/Main/Resource/ui/dialog/HarvestHongBao/底框-6.png.meta
View file @ b427b7d4
fileFormatVersion: 2
guid: 8b82cb11f774d4acf8a24c5ebe4c5653
guid: 430fac33e36dd43749c93d32c2a5b813
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
......
Assets/Game/Main/Resource/ui/dialog/plantTree/提示语-2.png.meta → Assets/Game/Main/Resource/ui/dialog/plantTree/组 1-6.png.meta
View file @ b427b7d4
fileFormatVersion: 2
guid: 0854bc9bf1b2e4d4eb5668639bed273f
guid: 491c26bb2258343a9845aff6448302ab
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
......
Assets/Resources/Fruit/种树提现.png.meta → Assets/Game/Main/Resource/ui/dialog/plantTree/组 1-7.png.meta
View file @ b427b7d4
fileFormatVersion: 2
guid: 2e038c1e47800be4f96da129cc6af7d2
guid: fe8b1d4f9eb494e5fb3e247ee1fb6e8d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
......
Assets/Game/Main/Resource/ui/dialog/plantTree/提示语-3.png.meta → Assets/Game/Main/Resource/ui/dialog/plantTree/组 1-8.png.meta
View file @ b427b7d4
fileFormatVersion: 2
guid: 85aca769f08c84ae8864bc4438aad6e8
guid: bf84ded8fdc25426b811e369a81b1b36
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
......
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ b427b7d4
......@@ -783,6 +783,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 16587608}
m_CullTransparentMesh: 0
--- !u!1 &20873732
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 20873733}
- component: {fileID: 20873734}
- component: {fileID: 20873735}
m_Layer: 5
m_Name: one
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &20873733
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 20873732}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 1332778818}
m_Father: {fileID: 635405089}
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: 39, y: -50}
m_SizeDelta: {x: 93, y: 87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &20873734
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 20873732}
m_CullTransparentMesh: 0
--- !u!114 &20873735
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 20873732}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 641bddf6beb8f1a4780310c66f09e7f6, 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
m_PixelsPerUnitMultiplier: 1
--- !u!1 &25255522
GameObject:
m_ObjectHideFlags: 0
......@@ -1749,7 +1824,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8b82cb11f774d4acf8a24c5ebe4c5653, type: 3}
m_Sprite: {fileID: 21300000, guid: 491c26bb2258343a9845aff6448302ab, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -1856,7 +1931,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &52321695
RectTransform:
m_ObjectHideFlags: 0
......@@ -3458,6 +3533,80 @@ MonoBehaviour:
baiyuanhongbao: {fileID: 6910674077120379796}
baiyuanfudong: {fileID: 975287117}
caomeiDialog: {fileID: 1428953456}
--- !u!1 &110549203
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 110549204}
- component: {fileID: 110549206}
- component: {fileID: 110549205}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &110549204
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 110549203}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.3, y: 1.3, z: 1}
m_Children: []
m_Father: {fileID: 1468268974}
m_RootOrder: 6
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: -80, y: 77}
m_SizeDelta: {x: 87, y: 89}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &110549205
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 110549203}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0670b20daddf0dc499cf56a16bbbd5c7, 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
m_PixelsPerUnitMultiplier: 1
--- !u!222 &110549206
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 110549203}
m_CullTransparentMesh: 0
--- !u!1 &111127868
GameObject:
m_ObjectHideFlags: 0
......@@ -4340,6 +4489,81 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &151723297
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 151723300}
- component: {fileID: 151723299}
- component: {fileID: 151723298}
m_Layer: 5
m_Name: three
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &151723298
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 151723297}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0670b20daddf0dc499cf56a16bbbd5c7, 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
m_PixelsPerUnitMultiplier: 1
--- !u!222 &151723299
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 151723297}
m_CullTransparentMesh: 0
--- !u!224 &151723300
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 151723297}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 1483682263}
m_Father: {fileID: 635405089}
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: 434.1, y: -50.8}
m_SizeDelta: {x: 105, y: 93}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &154575108
GameObject:
m_ObjectHideFlags: 0
......@@ -9107,9 +9331,9 @@ RectTransform:
m_Father: {fileID: 1548415916}
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: -72.5}
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_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &300181110
......@@ -15900,7 +16124,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 35
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
......@@ -15911,7 +16135,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5DF2\u5B58\u5165\u6211\u7684\u94B1\u5305"
m_Text: "\u770B\u89C6\u9891\u5F97\u73B0\u91D1\uFF0C\u73B0\u91D1\u53EF100%\u5168\u989D\u63D0\u73B0"
--- !u!222 &491706337
CanvasRenderer:
m_ObjectHideFlags: 0
......@@ -18425,7 +18649,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 339}
m_SizeDelta: {x: 600, y: 52}
m_SizeDelta: {x: 592, y: 51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &561110257
MonoBehaviour:
......@@ -18446,7 +18670,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0854bc9bf1b2e4d4eb5668639bed273f, type: 3}
m_Sprite: {fileID: 21300000, guid: bf84ded8fdc25426b811e369a81b1b36, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -20231,6 +20455,84 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 634203767}
m_CullTransparentMesh: 0
--- !u!1 &635405088
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 635405089}
- component: {fileID: 635405091}
- component: {fileID: 635405090}
m_Layer: 5
m_Name: infolist
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &635405089
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 635405088}
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: 20873733}
- {fileID: 1534657272}
- {fileID: 151723300}
m_Father: {fileID: 1468268974}
m_RootOrder: 9
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: -156}
m_SizeDelta: {x: 498.8, y: 105.98645}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &635405090
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 635405088}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!114 &635405091
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 635405088}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 100, y: 100}
m_Spacing: {x: 40, y: 0}
m_Constraint: 1
m_ConstraintCount: 3
--- !u!1 &640083650
GameObject:
m_ObjectHideFlags: 0
......@@ -23241,7 +23543,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &730945826
RectTransform:
m_ObjectHideFlags: 0
......@@ -29234,6 +29536,84 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 458}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &954805890
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 954805891}
- component: {fileID: 954805893}
- component: {fileID: 954805892}
m_Layer: 5
m_Name: tv_cai_shouyi
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &954805891
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 954805890}
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: 1468268974}
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: 95, y: 113}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &954805892
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 954805890}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.24705882, g: 0.4, b: 0.6, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u767D\u83DC\u6536\u76CA"
--- !u!222 &954805893
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 954805890}
m_CullTransparentMesh: 0
--- !u!1 &957335904
GameObject:
m_ObjectHideFlags: 0
......@@ -33275,7 +33655,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 85aca769f08c84ae8864bc4438aad6e8, type: 3}
m_Sprite: {fileID: 21300000, guid: fe8b1d4f9eb494e5fb3e247ee1fb6e8d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -34514,7 +34894,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 35
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
......@@ -34525,7 +34905,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5DF2\u5B58\u5165\u6211\u7684\u94B1\u5305"
m_Text: "\u770B\u89C6\u9891\u5F97\u73B0\u91D1\uFF0C\u73B0\u91D1\u53EF100%\u5168\u989D\u63D0\u73B0"
--- !u!222 &1136918974
CanvasRenderer:
m_ObjectHideFlags: 0
......@@ -39874,6 +40254,84 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1300401822}
m_CullTransparentMesh: 0
--- !u!1 &1305150697
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1305150698}
- component: {fileID: 1305150700}
- component: {fileID: 1305150699}
m_Layer: 5
m_Name: tv_tiaojian
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1305150698
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1305150697}
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: 1468268974}
m_RootOrder: 8
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: -71}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1305150699
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1305150697}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.24705882, g: 0.4, b: 0.6, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u8DDD\u79BB0.3\u5143\u65E0\u95E8\u69DB\u63D0\u73B0\u8FD8\u5DEE\n"
--- !u!222 &1305150700
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1305150697}
m_CullTransparentMesh: 0
--- !u!1 &1309922110
GameObject:
m_ObjectHideFlags: 0
......@@ -40815,6 +41273,84 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &1332778817
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1332778818}
- component: {fileID: 1332778820}
- component: {fileID: 1332778821}
m_Layer: 5
m_Name: onenum
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1332778818
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1332778817}
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: 20873733}
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: 123, y: -16.1}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1332778820
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1332778817}
m_CullTransparentMesh: 0
--- !u!114 &1332778821
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1332778817}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.24705882, g: 0.4, b: 0.6, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 70
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 70
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: x 1
--- !u!1 &1337249711
GameObject:
m_ObjectHideFlags: 0
......@@ -45025,13 +45561,17 @@ RectTransform:
- {fileID: 1662436571}
- {fileID: 1998896343}
- {fileID: 967568968}
- {fileID: 110549204}
- {fileID: 954805891}
- {fileID: 1305150698}
- {fileID: 635405089}
m_Father: {fileID: 481542523}
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: 120}
m_SizeDelta: {x: 703, y: 499}
m_SizeDelta: {x: 705, y: 532}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1468268975
MonoBehaviour:
......@@ -45052,7 +45592,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: c6b289d8394d84c4c9470df1641bdd04, type: 3}
m_Sprite: {fileID: 21300000, guid: 430fac33e36dd43749c93d32c2a5b813, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -45340,6 +45880,84 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1483682262
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1483682263}
- component: {fileID: 1483682265}
- component: {fileID: 1483682266}
m_Layer: 5
m_Name: threenum
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1483682263
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1483682262}
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: 151723300}
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: 130, y: -15}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1483682265
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1483682262}
m_CullTransparentMesh: 0
--- !u!114 &1483682266
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1483682262}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.24705882, g: 0.4, b: 0.6, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 70
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 70
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: x 1
--- !u!1 &1485572463
GameObject:
m_ObjectHideFlags: 0
......@@ -46461,6 +47079,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1531958711}
m_CullTransparentMesh: 0
--- !u!1 &1534657271
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1534657272}
- component: {fileID: 1534657273}
- component: {fileID: 1534657274}
m_Layer: 5
m_Name: two
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1534657272
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1534657271}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children:
- {fileID: 1756649073}
m_Father: {fileID: 635405089}
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: 239, y: -50}
m_SizeDelta: {x: 110, y: 95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1534657273
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1534657271}
m_CullTransparentMesh: 0
--- !u!114 &1534657274
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1534657271}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: d92ef970921c5af4cb23a00081748ec9, 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
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1536416653
GameObject:
m_ObjectHideFlags: 0
......@@ -50234,7 +50927,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: 320, y: 232}
m_AnchoredPosition: {x: 320, y: 262}
m_SizeDelta: {x: 105, y: 108}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1632121397
......@@ -51449,7 +52142,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1662436571
RectTransform:
m_ObjectHideFlags: 0
......@@ -54308,6 +55001,84 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &1756649072
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1756649073}
- component: {fileID: 1756649075}
- component: {fileID: 1756649076}
m_Layer: 5
m_Name: twonum
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1756649073
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1756649072}
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: 1534657272}
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: 134, y: -16.1}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1756649075
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1756649072}
m_CullTransparentMesh: 0
--- !u!114 &1756649076
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1756649072}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.24705882, g: 0.4, b: 0.6, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 70
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 70
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: x 1
--- !u!1001 &1757219671
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -60922,8 +61693,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, y: -69}
m_SizeDelta: {x: 236, y: 100}
m_AnchoredPosition: {x: 86, y: 52.088}
m_SizeDelta: {x: 233.92502, y: 104.17508}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1998896344
MonoBehaviour:
......@@ -60938,7 +61709,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
......@@ -60946,18 +61717,18 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 86
m_FontSize: 73
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 8
m_MaxSize: 86
m_MinSize: 0
m_MaxSize: 73
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
m_Text: "\uFFE50.3"
--- !u!222 &1998896345
CanvasRenderer:
m_ObjectHideFlags: 0
......@@ -62521,6 +63292,25 @@ MonoBehaviour:
jingxiDialog: {fileID: 510203513}
newhappygetDialog: {fileID: 175862548}
tv_new_cash: {fileID: 1286733339}
fruitSprites:
- {fileID: 21300000, guid: 0670b20daddf0dc499cf56a16bbbd5c7, type: 3}
- {fileID: 21300000, guid: 641bddf6beb8f1a4780310c66f09e7f6, type: 3}
- {fileID: 21300000, guid: d92ef970921c5af4cb23a00081748ec9, type: 3}
- {fileID: 21300000, guid: 0c520f4a549cc05449cbde3bc94a0dd9, type: 3}
- {fileID: 21300000, guid: 0d3465ec8d89cd74889c44d661878cc2, type: 3}
- {fileID: 21300000, guid: 8402417bff0041546b32a2f8250144b8, type: 3}
- {fileID: 21300000, guid: 778a33a7ff12afd4f87aaead13f6f147, type: 3}
- {fileID: 21300000, guid: 5b1a4e128fba15146a3c294b867c19e3, type: 3}
- {fileID: 21300000, guid: 64764804cd3e6774f8e71784774e9eb6, type: 3}
tvshouyi: {fileID: 954805892}
tvtiaojian: {fileID: 1305150699}
oneNum: {fileID: 1332778821}
twoNum: {fileID: 1756649076}
threeNum: {fileID: 1483682266}
imgBig: {fileID: 110549205}
imglittleone: {fileID: 20873735}
imglittletwo: {fileID: 1534657274}
imglittlethree: {fileID: 151723298}
RealAwards: {fileID: 3336770981114390305, guid: c8a7c6a15b5684cebbd1bbb8dec4d3b6,
type: 3}
rdp: {fileID: 1520725255}
......@@ -65140,7 +65930,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: 10, y: 236}
m_AnchoredPosition: {x: 10, y: 261}
m_SizeDelta: {x: 553, y: 127}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2131808849
Assets/Game/Main/Scripts/Model/HavestBean.cs
View file @ b427b7d4
using System;
using System.Collections.Generic;
public class HavestBean
{
public LandListData landStatusDTO;
public int harvestPlantId;
public double harvestPlantPrice;
public double rewardCash;
public WdInfo wdInfo;
public class WdInfo
{
public int id;
public double yuan;
public List<InfoList> infoList;
public class InfoList
{
public int woodId;
public int current;
public int targetNum;
}
}
}
Assets/Game/Main/Scripts/Presenter/CarPresenter.cs
View file @ b427b7d4
......@@ -132,7 +132,7 @@ public class CarPresenter : CarContract.Presenter
{
parm.Clear();
parm.Add("landId", landId);
HttpTool.Instance._Post("app/v2/cscmnq/harvest_plant", parm, new Action<HavestBean>((bean) =>
HttpTool.Instance._Post("app/v3/cscmnq/harvest_plant", parm, new Action<HavestBean>((bean) =>
//HttpTool.Instance._Post("app/v1/cscmnq/harvest_plant", parm, new Action<HavestBean>((bean) =>
{
UnityEngine.Debug.Log("收取接口成功");
......@@ -155,7 +155,7 @@ public class CarPresenter : CarContract.Presenter
}
else
{
DialogControl.Instance.ShowHarvestHongBao(bean.harvestPlantPrice, landId);
DialogControl.Instance.ShowHarvestHongBao(bean.harvestPlantPrice, landId,bean.harvestPlantId,bean.wdInfo);
}
// EventCenter.Broadcast(MyEventType.FlyGuoshi, landId);
mView.CarInfo(bean.landStatusDTO);
......
Assets/Game/Main/Scripts/Utils/Guide.cs
View file @ b427b7d4
......@@ -88,7 +88,7 @@ public class Guide : MonoBehaviour
public void showGuide(bool isUser)
{
//isUser = true;
//isUser = true;
if (isStartShow)
{
return;
......@@ -216,12 +216,12 @@ public class Guide : MonoBehaviour
{
Debug.Log("点击第5步");
DissmissGuide(false);
if (PlayerPrefs.GetInt(step6Key, 0) == 0)
{
PlayerPrefs.SetInt(step6Key, 1);
Debug.Log("显示第7步");
Step7.SetActive(true);
}
//if (PlayerPrefs.GetInt(step6Key, 0) == 0)
//{
// PlayerPrefs.SetInt(step6Key, 1);
// Debug.Log("显示第7步");
// Step7.SetActive(true);
//}
//EventUtils.OnEvent("newUser_cashOut", "当日新用户完成引导提现");
//ObjStep5.SetActive(false);
//hand_5.SetActive(false);
......@@ -241,52 +241,52 @@ public class Guide : MonoBehaviour
public void onClickStep6()
{
DissmissGuide(false);
if (PlayerPrefs.GetInt(step7Key, 0) == 0)
{
PlayerPrefs.SetInt(step7Key, 1);
Debug.Log("显示第7步");
Step7.SetActive(true);
}
//if (PlayerPrefs.GetInt(step7Key, 0) == 0)
//{
// PlayerPrefs.SetInt(step7Key, 1);
// Debug.Log("显示第7步");
// Step7.SetActive(true);
//}
}
public void onClickStep7()
{
DissmissGuide(false);
if (PlayerPrefs.GetInt(step8Key, 0) == 0)
{
PlayerPrefs.SetInt(step8Key, 1);
Debug.Log("显示第8步");
Step8.SetActive(true);
}
//if (PlayerPrefs.GetInt(step8Key, 0) == 0)
//{
// PlayerPrefs.SetInt(step8Key, 1);
// Debug.Log("显示第8步");
// Step8.SetActive(true);
//}
}
public void onClickStep8()
{
DissmissGuide(false);
if (PlayerPrefs.GetInt(step9Key, 0) == 0)
{
PlayerPrefs.SetInt(step9Key, 1);
Debug.Log("显示第9步");
Step9.SetActive(true);
}
//if (PlayerPrefs.GetInt(step9Key, 0) == 0)
//{
// PlayerPrefs.SetInt(step9Key, 1);
// Debug.Log("显示第9步");
// Step9.SetActive(true);
//}
}
public void onClickStep9()
{
DissmissGuide(false);
if (PlayerPrefs.GetInt(step10Key, 0) == 0)
{
PlayerPrefs.SetInt(step10Key, 1);
Debug.Log("显示第10步");
Step10.SetActive(true);
}
//if (PlayerPrefs.GetInt(step10Key, 0) == 0)
//{
// PlayerPrefs.SetInt(step10Key, 1);
// Debug.Log("显示第10步");
// Step10.SetActive(true);
//}
}
public void onClickStep10()
{
DissmissGuide(false);
if (PlayerPrefs.GetInt(step11Key, 0) == 0)
{
PlayerPrefs.SetInt(step11Key, 1);
Debug.Log("显示第11步");
Step11.SetActive(true);
}
//if (PlayerPrefs.GetInt(step11Key, 0) == 0)
//{
// PlayerPrefs.SetInt(step11Key, 1);
// Debug.Log("显示第11步");
// Step11.SetActive(true);
//}
}
public void onClickStep11()
{
......
Assets/Game/Main/Scripts/Utils/JumpUtils.cs
View file @ b427b7d4
......@@ -65,9 +65,9 @@ public class JumpUtils : MonoBehaviour
AudioUtils.ins.PlayBtnAudio();
HomeCamera.depth = 1;
SettingCamera.depth = 0;
WithDrawCamera.depth = 0;
// WithDrawCamera.depth = 0;
WithDrawRecordCamera.depth = 0;
WithDrawEveryDayCamera.depth = 0;
// WithDrawEveryDayCamera.depth = 0;
}
/// <summary>
......
Assets/Game/Main/Scripts/View/DialogControl.cs
View file @ b427b7d4
......@@ -46,6 +46,9 @@ public class DialogControl : MonoBehaviour
public GameObject jingxiDialog;
public GameObject newhappygetDialog;//有双倍领取的开心收下弹窗
public Text tv_new_cash;
public Sprite[] fruitSprites;
public Text tvshouyi, tvtiaojian, oneNum, twoNum, threeNum;
public Image imgBig, imglittleone,imglittletwo,imglittlethree;
/// <summary>
/// 实物奖励弹窗预制体
/// </summary>
......@@ -817,7 +820,7 @@ public class DialogControl : MonoBehaviour
public void showHappyGetDialog(string cash)
{
happygetDialog.SetActive(true);
tv_cash.text = cash;
tv_cash.text = "¥"+cash;
Text TitleText = happygetDialog.transform.Find("Image/Text").GetComponent<Text>();
TitleText.text = Constant.Instance.shubiao ? "恭喜获得 现金奖励" : "恭喜获得 金币奖励";
......@@ -838,7 +841,7 @@ public class DialogControl : MonoBehaviour
public void showNewHappyGetDialog(string cash)
{
newhappygetDialog.SetActive(true);
tv_new_cash.text = cash;
tv_new_cash.text = "¥"+cash;
}
private int action;
//关闭带双倍领取的开心收下弹窗
......@@ -1376,17 +1379,131 @@ public class DialogControl : MonoBehaviour
/// 显示收货奖励弹窗
/// </summary>
/// <param name="money">奖励金额</param>
public void ShowHarvestHongBao(double money, int landId)
public void ShowHarvestHongBao(double money, int landId, int harvestPlantId, HavestBean.WdInfo wdInfo)
{
transform.Find("HarvestHongBao").gameObject.SetActive(true);
transform.Find("HarvestHongBao/BgImage/MoneyText").GetComponent<Text>().text = "¥" + money.ToString();
setBigImg(harvestPlantId, imgBig);
setTvtijian(harvestPlantId);
if (wdInfo.infoList.Count > 0)
{
int num1 = wdInfo.infoList[0].targetNum - wdInfo.infoList[0].current;
if (num1 <=0)
{
oneNum.text = "x " + 0;
}
else
{
oneNum.text = "x " + num1;
}
int num2 = wdInfo.infoList[1].targetNum - wdInfo.infoList[1].current;
if (num2 <= 0)
{
twoNum.text = "x " + 0;
}
else
{
twoNum.text = "x " + num2;
}
int num3 = wdInfo.infoList[2].targetNum - wdInfo.infoList[2].current;
if (num3 <= 0)
{
threeNum.text = "x " + 0;
}
else
{
threeNum.text = "x " + num3;
}
setBigImg(wdInfo.infoList[0].woodId, imglittleone);
setBigImg(wdInfo.infoList[1].woodId, imglittletwo);
setBigImg(wdInfo.infoList[2].woodId, imglittlethree);
}
DialogControl.landId = landId;
tvtiaojian.text = "距离"+ "<color=#FF0000><size=45>" + wdInfo.yuan+"元</size></color>"+"无门槛提现还差";
Invoke("showAd", 0.5f);
Invoke("moveHarvestHongBao", 1f);
}
private void setTvtijian(int harvestPlantId)
{
switch (harvestPlantId)
{
case 1:
tvshouyi.text = "白菜收益";
break;
case 2:
tvshouyi.text = "西红柿收益";
break;
case 3:
tvshouyi.text = "南瓜收益";
break;
case 4:
tvshouyi.text = "萝卜收益";
break;
case 5:
tvshouyi.text = "玉米收益";
break;
case 6:
tvshouyi.text = "茄子收益";
break;
case 7:
tvshouyi.text = "西瓜收益";
break;
case 8:
tvshouyi.text = "葡萄收益";
break;
case 9:
tvshouyi.text = "草莓收益";
break;
}
}
private void setBigImg(int landId,Image image)
{
switch (landId)
{
case 1:
image.sprite = fruitSprites[0];
break;
case 2:
image.sprite = fruitSprites[1];
break;
case 3:
image.sprite = fruitSprites[2];
break;
case 4:
image.sprite = fruitSprites[3];
break;
case 5:
image.sprite = fruitSprites[4];
break;
case 6:
image.sprite = fruitSprites[5];
break;
case 7:
image.sprite = fruitSprites[6];
break;
case 8:
image.sprite = fruitSprites[7];
break;
case 9:
image.sprite = fruitSprites[8];
break;
}
}
/// <summary>
/// 收货奖励弹窗移动
/// </summary>
......
ProjectSettings/ProjectSettings.asset
View file @ b427b7d4
......@@ -131,7 +131,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 1.0.9
bundleVersion: 1.0.10
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
......@@ -179,7 +179,7 @@ PlayerSettings:
iPhone: com.ym.simulator
buildNumber:
iPhone: 6
AndroidBundleVersionCode: 10
AndroidBundleVersionCode: 11
AndroidMinSdkVersion: 21
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1
......
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