Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
W
wdlc_mjb_unity
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王雪伟
wdlc_mjb_unity
Commits
69cd238c
Commit
69cd238c
authored
Jun 23, 2021
by
maxiaoliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
b41b8bb5
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
625 additions
and
21 deletions
+625
-21
开启幸运.png
Assets/Game/Main/Resource/ui/dialog/luckyturntable/开启幸运.png
+0
-0
CrazyCar.unity
Assets/Game/Main/Scenes/CrazyCar.unity
+561
-6
Guide.cs
Assets/Game/Main/Scripts/Utils/Guide.cs
+45
-0
DialogControl.cs
Assets/Game/Main/Scripts/View/DialogControl.cs
+9
-5
HomeInfoControl.cs
Assets/Game/Main/Scripts/View/HomeInfoControl.cs
+1
-1
PlantTreeControl.cs
Assets/Game/Main/Scripts/dialog/PlantTreeControl.cs
+8
-8
PackageManagerSettings.asset
ProjectSettings/PackageManagerSettings.asset
+1
-1
No files found.
Assets/Game/Main/Resource/ui/dialog/luckyturntable/开启幸运.png
View replaced file @
b41b8bb5
View file @
69cd238c
38.2 KB
|
W:
|
H:
41.7 KB
|
W:
|
H:
2-up
Swipe
Onion skin
Assets/Game/Main/Scenes/CrazyCar.unity
View file @
69cd238c
...
...
@@ -1508,6 +1508,80 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 48029598}
m_CullTransparentMesh: 0
--- !u!1 &48656713
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 48656714}
- component: {fileID: 48656716}
- component: {fileID: 48656715}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &48656714
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 48656713}
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: 703223718}
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: -235, y: -528}
m_SizeDelta: {x: 98, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &48656715
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 48656713}
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: ff8fe5f5113094fbbb0ef45fa9265048, 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 &48656716
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 48656713}
m_CullTransparentMesh: 0
--- !u!1 &48981434
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -6591,6 +6665,42 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 223744065}
m_CullTransparentMesh: 0
--- !u!1 &225291232
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 225291233}
m_Layer: 5
m_Name: Step9
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &225291233
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 225291232}
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: 2098422174}
m_Father: {fileID: 970469213}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -667}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &227095874
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -9593,6 +9703,42 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 311469826}
m_CullTransparentMesh: 0
--- !u!1 &312064228
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 312064229}
m_Layer: 5
m_Name: Step7
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &312064229
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 312064228}
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: 1725500822}
m_Father: {fileID: 970469213}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &318501426
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -22633,6 +22779,42 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 700544935}
m_CullTransparentMesh: 0
--- !u!1 &703223717
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 703223718}
m_Layer: 5
m_Name: Step10
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &703223718
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 703223717}
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: 48656714}
m_Father: {fileID: 970469213}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 667}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &703432075
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -30549,6 +30731,11 @@ RectTransform:
- {fileID: 577554102}
- {fileID: 290488167}
- {fileID: 699910950}
- {fileID: 312064229}
- {fileID: 1284155201}
- {fileID: 225291233}
- {fileID: 703223718}
- {fileID: 1274492072}
m_Father: {fileID: 0}
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...
...
@@ -38617,6 +38804,42 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1268367642}
m_CullTransparentMesh: 0
--- !u!1 &1274492071
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1274492072}
m_Layer: 5
m_Name: Step11
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1274492072
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1274492071}
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: 1439787991}
m_Father: {fileID: 970469213}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 667}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1274549007
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -39121,6 +39344,42 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &1284155200
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1284155201}
m_Layer: 5
m_Name: Step8
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1284155201
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1284155200}
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: 1443660351}
m_Father: {fileID: 970469213}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1286803938
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -44452,6 +44711,80 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 1438114496}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1439787990
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1439787991}
- component: {fileID: 1439787993}
- component: {fileID: 1439787992}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1439787991
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1439787990}
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: 1274492072}
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: 186, y: -521}
m_SizeDelta: {x: 98, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1439787992
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1439787990}
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: ff8fe5f5113094fbbb0ef45fa9265048, 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 &1439787993
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1439787990}
m_CullTransparentMesh: 0
--- !u!1 &1440887898
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -44735,6 +45068,80 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1443636807}
m_CullTransparentMesh: 0
--- !u!1 &1443660350
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1443660351}
- component: {fileID: 1443660353}
- component: {fileID: 1443660352}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1443660351
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1443660350}
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: 1284155201}
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: 55, y: -236}
m_SizeDelta: {x: 97, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1443660352
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1443660350}
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: ce65a2a00524549f3978918c7a7bbcec, 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 &1443660353
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1443660350}
m_CullTransparentMesh: 0
--- !u!1 &1444234398
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -53779,6 +54186,80 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1722435939}
m_CullTransparentMesh: 0
--- !u!1 &1725500821
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1725500822}
- component: {fileID: 1725500824}
- component: {fileID: 1725500823}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1725500822
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1725500821}
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: 312064229}
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: -80, y: -220}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1725500823
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1725500821}
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: ce65a2a00524549f3978918c7a7bbcec, 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 &1725500824
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1725500821}
m_CullTransparentMesh: 0
--- !u!1 &1725731800
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -62483,12 +62964,12 @@ MonoBehaviour:
flyBox: {fileID: 771430748}
step4: {fileID: 415499551}
Step5: {fileID: 290488166}
Step6: {fileID:
0
}
Step7: {fileID:
0
}
Step8: {fileID: 0}
Step9: {fileID:
0
}
Step10: {fileID:
0
}
Step11: {fileID:
0
}
Step6: {fileID:
699910949
}
Step7: {fileID:
312064228
}
Step8: {fileID:
128415520
0}
Step9: {fileID:
225291232
}
Step10: {fileID:
703223717
}
Step11: {fileID:
1274492071
}
--- !u!1 &2020284656
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -64987,6 +65468,80 @@ RectTransform:
m_AnchoredPosition: {x: -5.3914, y: 13.21}
m_SizeDelta: {x: 124.05795, y: 41.419693}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2098422173
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2098422174}
- component: {fileID: 2098422176}
- component: {fileID: 2098422175}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2098422174
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2098422173}
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: 225291233}
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: -232, y: 426}
m_SizeDelta: {x: 97, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2098422175
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2098422173}
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: ce65a2a00524549f3978918c7a7bbcec, 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 &2098422176
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2098422173}
m_CullTransparentMesh: 0
--- !u!1 &2102020959
GameObject:
m_ObjectHideFlags: 0
Assets/Game/Main/Scripts/Utils/Guide.cs
View file @
69cd238c
...
...
@@ -216,6 +216,51 @@ public class Guide : MonoBehaviour
Step7
.
SetActive
(
true
);
}
}
public
void
onClickStep7
()
{
DissmissGuide
(
false
);
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
);
}
}
public
void
onClickStep9
()
{
DissmissGuide
(
false
);
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
);
}
}
public
void
onClickStep11
()
{
DissmissGuide
(
false
);
}
//public void onClickStep6()
//{
// Debug.Log("点击第6步");
...
...
Assets/Game/Main/Scripts/View/DialogControl.cs
View file @
69cd238c
...
...
@@ -514,17 +514,21 @@ public class DialogControl : MonoBehaviour
//关闭获取钻石弹窗
public
void
closeDiamondDialog
()
{
if
(
DiamondDialog
.
activeSelf
)
{
AudioUtils
.
ins
.
PlayBtnAudio
();
DiamondDialog
.
SetActive
(
false
);
diamondcontent
.
transform
.
localPosition
-=
new
Vector3
(
0
,
340
,
0
);
AdUtils
.
closeFeedAd
();
}
}
//获取钻石奖励
public
void
getDiamondReward
()
{
//closeDiamondDialog();
closeDiamondDialog
();
AudioUtils
.
ins
.
PlayBtnAudio
();
EventUtils
.
OnEvent
(
"addDiamond_click"
,
"点击钻石加号"
);
HttpTool
.
Instance
.
_Get
(
"app/v1/wdlc/reward/diamond_by_video_status"
,
null
,
new
Action
<
DiamondStatusBean
>((
bean
)
=>
...
...
Assets/Game/Main/Scripts/View/HomeInfoControl.cs
View file @
69cd238c
...
...
@@ -708,7 +708,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
public
void
DidSelectedShiwujiangli
()
{
AudioUtils
.
ins
.
PlayBtnAudio
();
Guide
.
guide
.
onClickStep7
();
EventUtils
.
OnEvent
(
"click_wodelibao"
,
"点击我的礼包"
);
if
(
RealAwardsVM
.
dataModel
!=
null
)
...
...
Assets/Game/Main/Scripts/dialog/PlantTreeControl.cs
View file @
69cd238c
...
...
@@ -13,14 +13,14 @@ public class PlantTreeControl : MonoBehaviour
{
clickone
();
}
//
private void Awake()
//
{
//
EventCenter.AddListener(MyEventType.RefreshPlantTreeWithDraw, getWithDrawData);
//
}
//
private void OnDestroy()
//
{
//
EventCenter.RemoveListener(MyEventType.RefreshPlantTreeWithDraw, getWithDrawData);
//
}
private
void
Awake
()
{
EventCenter
.
AddListener
(
MyEventType
.
RefreshPlantTreeWithDraw
,
getWithDrawData
);
}
private
void
OnDestroy
()
{
EventCenter
.
RemoveListener
(
MyEventType
.
RefreshPlantTreeWithDraw
,
getWithDrawData
);
}
//void Start()
//{
// // getWithDrawData();
...
...
ProjectSettings/PackageManagerSettings.asset
View file @
69cd238c
...
...
@@ -17,7 +17,7 @@ MonoBehaviour:
m_Registries
:
-
m_Id
:
main
m_Name
:
m_Url
:
https://packages.unity.c
om
m_Url
:
https://packages.unity.c
n
m_Scopes
:
[]
m_IsDefault
:
1
m_UserSelectedRegistryName
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment