备份

Assets/Editor.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5fcd7f3618d0f154995b49930421ea1b
+folderAsset: yes
+timeCreated: 1501174341
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/metro/UWP.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: b3a793fc2ce8625488a5576817135789
+folderAsset: yes
+timeCreated: 1501174341
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/metro/WindowsPhone81.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: ea89367846fcf554188c49cca742be04
+folderAsset: yes
+timeCreated: 1501174341
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Mobile/极风游游戏JOGO.png.meta

@@ -94,7 +94,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: UI
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -77,6 +77,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1029950091330624
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224667753801520886}
+  - component: {fileID: 222217425973178380}
+  - component: {fileID: 114149792560670858}
+  m_Layer: 5
+  m_Name: L_ShareLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1033132708339614
 GameObject:
   m_ObjectHideFlags: 1
@@ -196,6 +213,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1076997327083286
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224325760142200524}
+  - component: {fileID: 222615705513963032}
+  - component: {fileID: 114281723428135118}
+  m_Layer: 5
+  m_Name: Lc_CreditsIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1088238922793968
 GameObject:
   m_ObjectHideFlags: 1
@@ -295,6 +329,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1142256444376096
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224743514926715882}
+  - component: {fileID: 222058844974394040}
+  - component: {fileID: 114268939215798218}
+  - component: {fileID: 114179938754594538}
+  m_Layer: 5
+  m_Name: L_ShareBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1147339191996728
 GameObject:
   m_ObjectHideFlags: 1
@@ -626,6 +678,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1360033100686446
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224183369780365308}
+  m_Layer: 5
+  m_Name: Lc_Pos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1374899657360754
 GameObject:
   m_ObjectHideFlags: 1
@@ -832,6 +899,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1446826123840378
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224414725468353712}
+  - component: {fileID: 222210753708691386}
+  - component: {fileID: 114697668698374792}
+  m_Layer: 5
+  m_Name: L_CreditsLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1453969658883076
 GameObject:
   m_ObjectHideFlags: 1
@@ -1795,13 +1879,15 @@ GameObject:
   - component: {fileID: 224245704574993374}
   - component: {fileID: 222382345498978876}
   - component: {fileID: 114428182742409526}
+  - component: {fileID: 225482098208479858}
+  - component: {fileID: 114843960337677540}
   m_Layer: 5
-  m_Name: L_ShareLab
+  m_Name: Lc_CreditsContent
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1847701378219472
 GameObject:
   m_ObjectHideFlags: 1
@@ -1884,7 +1970,7 @@ GameObject:
   - component: {fileID: 114202682075195982}
   - component: {fileID: 114186914697850690}
   m_Layer: 5
-  m_Name: L_ShareBtn
+  m_Name: L_CreditsBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1922,6 +2008,25 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1948596675510592
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224805457344542120}
+  - component: {fileID: 222802027213564410}
+  - component: {fileID: 114654469838533802}
+  - component: {fileID: 225318901350641710}
+  - component: {fileID: 114556930015583098}
+  m_Layer: 5
+  m_Name: Lc_CreditsMask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1963591930361836
 GameObject:
   m_ObjectHideFlags: 0
@@ -2585,6 +2690,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114149792560670858
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1029950091330624}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 15
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5206\u4EAB"
 --- !u!114 &114153638271670294
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2727,6 +2865,47 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114179938754594538
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1142256444376096}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114268939215798218}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114182624871455332
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3408,6 +3587,60 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114268939215798218
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1142256444376096}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0.8000001, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114281723428135118
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1076997327083286}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 9c5809f759997a043b3c85230b4118d1, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114312866216072174
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3901,18 +4134,18 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 15
+    m_FontSize: 25
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5206\u4EAB"
+  m_Text: "\u5236\u4F5C\u56E2\u961F"
 --- !u!114 &114469347800441656
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4389,6 +4622,47 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114556930015583098
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1948596675510592}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 0, g: 0, b: 0, a: 0.7058824}
+    m_HighlightedColor: {r: 0, g: 0, b: 0, a: 0.7058824}
+    m_PressedColor: {r: 0, g: 0, b: 0, a: 0.7058824}
+    m_DisabledColor: {r: 0, g: 0, b: 0, a: 0.7058824}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114654469838533802}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114563779888656676
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4987,6 +5261,33 @@ MonoBehaviour:
   - {x: 16.28015, y: -9.119171, z: 0}
   - {x: 3.8449154, y: -9.119171, z: 0}
   - {x: 3.8449154, y: 8.290155, z: 0}
+--- !u!114 &114654469838533802
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1948596675510592}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.7058824}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114657795351677872
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5186,6 +5487,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114697668698374792
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1446826123840378}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 15
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5F00\u653E\u56E2\u961F"
 --- !u!114 &114704206826109476
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5577,6 +5911,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
+--- !u!114 &114843960337677540
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1845848723281010}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!114 &114844266151606664
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6177,6 +6524,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1527941842562034}
+--- !u!222 &222058844974394040
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1142256444376096}
 --- !u!222 &222067763727223138
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -6279,6 +6632,18 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1860076403849980}
+--- !u!222 &222210753708691386
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1446826123840378}
+--- !u!222 &222217425973178380
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1029950091330624}
 --- !u!222 &222228578625470900
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -6513,6 +6878,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1273281902195670}
+--- !u!222 &222615705513963032
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1076997327083286}
 --- !u!222 &222622262795799312
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -6621,6 +6992,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1845098490578224}
+--- !u!222 &222802027213564410
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1948596675510592}
 --- !u!222 &222818371880910586
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7013,6 +7390,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224183369780365308
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1360033100686446}
+  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: 224805457344542120}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 750}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.49999997}
 --- !u!224 &224187723854600032
 RectTransform:
   m_ObjectHideFlags: 1
@@ -7152,18 +7547,19 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1845848723281010}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 224665774769174072}
-  m_RootOrder: 0
+  m_Children:
+  - {fileID: 224325760142200524}
+  m_Father: {fileID: 224805457344542120}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -0.000009536743, y: -224.7311}
+  m_SizeDelta: {x: 800, y: 24.19929}
+  m_Pivot: {x: 0.5, y: 0.99999994}
 --- !u!224 &224249425076514156
 RectTransform:
   m_ObjectHideFlags: 1
@@ -7312,6 +7708,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224325760142200524
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1076997327083286}
+  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: 224245704574993374}
+  m_RootOrder: 0
+  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.00000048886, y: 0}
+  m_SizeDelta: {x: 514, y: 158}
+  m_Pivot: {x: 0.5, y: 1.0000004}
 --- !u!224 &224337229391098628
 RectTransform:
   m_ObjectHideFlags: 1
@@ -7455,7 +7869,7 @@ RectTransform:
   - {fileID: 224820825785091366}
   - {fileID: 224482729533700574}
   m_Father: {fileID: 224585585345200954}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -7501,6 +7915,24 @@ RectTransform:
   m_AnchoredPosition: {x: 285, y: -42.5}
   m_SizeDelta: {x: 150, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224414725468353712
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1446826123840378}
+  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: 224665774769174072}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224416223429333302
 RectTransform:
   m_ObjectHideFlags: 1
@@ -7604,9 +8036,10 @@ RectTransform:
   m_Children:
   - {fileID: 224976199670148718}
   - {fileID: 224903318551868674}
+  - {fileID: 224743514926715882}
   - {fileID: 224665774769174072}
   m_Father: {fileID: 224585585345200954}
-  m_RootOrder: 3
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -7796,7 +8229,7 @@ RectTransform:
   m_Children:
   - {fileID: 224601279505825942}
   m_Father: {fileID: 224585585345200954}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -8009,9 +8442,9 @@ RectTransform:
   - {fileID: 224416223429333302}
   - {fileID: 224888167666931506}
   - {fileID: 224643019233325782}
-  - {fileID: 224444477690967882}
   - {fileID: 224515144435716944}
   - {fileID: 224408791352645432}
+  - {fileID: 224444477690967882}
   m_Father: {fileID: 224976257765136696}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8162,15 +8595,33 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224245704574993374}
+  - {fileID: 224414725468353712}
   m_Father: {fileID: 224444477690967882}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 184.20001, y: 0.09461975}
+  m_AnchoredPosition: {x: 304.2, y: -0.09436798}
   m_SizeDelta: {x: 100, y: 40}
   m_Pivot: {x: 0.5, y: 0.4999995}
+--- !u!224 &224667753801520886
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1029950091330624}
+  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: 224743514926715882}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224673431653805250
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8362,6 +8813,25 @@ RectTransform:
   m_AnchoredPosition: {x: 90, y: -41.181976}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224743514926715882
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1142256444376096}
+  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: 224667753801520886}
+  m_Father: {fileID: 224444477690967882}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 184.20001, y: 0.09461975}
+  m_SizeDelta: {x: 100, y: 40}
+  m_Pivot: {x: 0.5, y: 0.4999995}
 --- !u!224 &224769589049244374
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8438,6 +8908,26 @@ RectTransform:
   m_AnchoredPosition: {x: 40.19998, y: -0.004257202}
   m_SizeDelta: {x: 100, y: 40}
   m_Pivot: {x: 0.5, y: 0.4999995}
+--- !u!224 &224805457344542120
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1948596675510592}
+  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: 224183369780365308}
+  - {fileID: 224245704574993374}
+  m_Father: {fileID: 224976257765136696}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.000015258789, y: -0.13889027}
+  m_SizeDelta: {x: 800, y: 450.02}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224813247372850516
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8849,6 +9339,7 @@ RectTransform:
   - {fileID: 224585585345200954}
   - {fileID: 224599987969197820}
   - {fileID: 224983814714287144}
+  - {fileID: 224805457344542120}
   m_Father: {fileID: 224198081419304548}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8898,6 +9389,17 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!225 &225318901350641710
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1948596675510592}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225342293074376996
 CanvasGroup:
   m_ObjectHideFlags: 1
@@ -8942,6 +9444,17 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!225 &225482098208479858
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1845848723281010}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225542527829263708
 CanvasGroup:
   m_ObjectHideFlags: 1

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="0" />
+  <Version value="-2" />
 
   <ID value="Default" />
   <TutorialA value="1" />
@@ -19,13 +19,15 @@
   <Language value="Default" />
   
   <Coin value="0" />
+  <PackLock value="0" />
   <Diamond value="0" />
   <SignIndex value="1" />
   <MiniTimer value="0" />
   <SignRound value="1" />
   <CircleTimer value="0" />
   <MiniGameIndex value="0" />
-
+  <OneTimeReward value="" />
+  
   <Player value="PlayerBlond" />
   <PlantList value =""/>
   <DressList value =""/>

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -76,6 +76,7 @@
     <L_TraChiLab desc=""><![CDATA[繁體中文]]></L_TraChiLab>
     <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
     <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
+    <L_CreditsLab desc=""><![CDATA[制作团队]]></L_CreditsLab>
     <La_Tit desc=""><![CDATA[下载存档]]></La_Tit>
     <La_Lab0 desc=""><![CDATA[连接成功 请重新启动游戏]]></La_Lab0>
     <La_Lab1 desc=""><![CDATA[连接失败]]></La_Lab1>
@@ -85,6 +86,16 @@
     <Lb_Send0 desc=""><![CDATA[提交成功]]></Lb_Send0>
     <Lb_Send1 desc=""><![CDATA[请勿重复提交]]></Lb_Send1>
     <Lb_Send2 desc=""><![CDATA[内容不能为空]]></Lb_Send2>
+    <Lc_CreditsContent desc=""><![CDATA[制作团队
+
+美术XXX
+
+策划XXX
+
+音效XXX
+
+程序XXX
+]]></Lc_CreditsContent>
     <M_Tit desc=""><![CDATA[成就]]></M_Tit>
     <J_Info0 desc=""><![CDATA[获得]]></J_Info0>
     <J_Info1 desc=""><![CDATA[使用技能:]]></J_Info1>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -76,6 +76,7 @@
     <L_TraChiLab desc=""><![CDATA[繁體中文]]></L_TraChiLab>
     <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
     <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
+    <L_CreditsLab desc=""><![CDATA[製作團隊]]></L_CreditsLab>
     <La_Tit desc=""><![CDATA[下載存檔]]></La_Tit>
     <La_Lab0 desc=""><![CDATA[連接成功 請重新啓動遊戲]]></La_Lab0>
     <La_Lab1 desc=""><![CDATA[連接失敗]]></La_Lab1>
@@ -85,6 +86,7 @@
     <Lb_Send0 desc=""><![CDATA[提交成功]]></Lb_Send0>
     <Lb_Send1 desc=""><![CDATA[請勿重複提交]]></Lb_Send1>
     <Lb_Send2 desc=""><![CDATA[內容不能為空]]></Lb_Send2>
+    <Lc_CreditsContent desc=""><![CDATA[]]></Lc_CreditsContent>
     <M_Tit desc=""><![CDATA[成就]]></M_Tit>
     <J_Info0 desc=""><![CDATA[獲得]]></J_Info0>
     <J_Info1 desc=""><![CDATA[使用技能:]]></J_Info1>

Assets/Resource/XML/lan/English.xml

@@ -76,6 +76,7 @@
     <L_TraChiLab desc=""><![CDATA[繁體中文]]></L_TraChiLab>
     <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
     <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
+    <L_CreditsLab desc=""><![CDATA[Credits]]></L_CreditsLab>
     <La_Tit desc=""><![CDATA[Restore]]></La_Tit>
     <La_Lab0 desc=""><![CDATA[Connect successful, please restart the game]]></La_Lab0>
     <La_Lab1 desc=""><![CDATA[Connect failed]]></La_Lab1>
@@ -85,6 +86,7 @@
     <Lb_Send0 desc=""><![CDATA[Report successful]]></Lb_Send0>
     <Lb_Send1 desc=""><![CDATA[Please submit only once]]></Lb_Send1>
     <Lb_Send2 desc=""><![CDATA[Content must not be empty]]></Lb_Send2>
+    <Lc_CreditsContent desc=""><![CDATA[]]></Lc_CreditsContent>
     <M_Tit desc=""><![CDATA[Achievement]]></M_Tit>
     <J_Info0 desc=""><![CDATA[Get]]></J_Info0>
     <J_Info1 desc=""><![CDATA[Use skill:]]></J_Info1>

Assets/Script/Manage/Initializer.cs

@@ -44,7 +44,6 @@ public class Initializer : MonoBehaviour
 
         DontDestroyOnLoad(gameObject);
 
-        ManaServer.SetPackLock();
         ManaServer.Login(ManaCenter.LoginCallbackInitial);
 
         Instance = this;

Assets/Script/Manage/ManaCenter.cs

@@ -995,6 +995,8 @@ public class ManaCenter : Regist
             return;
         }
 
+        ManaServer.SetPackLock();
+
         if (ManaServer.Connect)
         {
             if (ManaData.GetPlayerString("ID") == "Default")

Assets/Script/Manage/ManaMiniGame.cs

@@ -1797,18 +1797,21 @@ public class ManaMiniGame : Regist
         {
             idList.Add(FlowerIDListC[1]);
             idList.Add(FlowerIDListC[1]);
+
+            idList.RemoveAt(0);
+            idList.Insert(Random.Range(0, 3), FlowerIDListC[0]);
         }
         else if (FlowerIDListC.Count > 2)
         {
             idList.AddRange(FlowerIDListC.Random(2, true, false, id => { return id != idList[0]; }));
+
+            idList = idList.Disturb();
         }
         else
         {
             throw new Exception();
         }
 
-        idList = idList.Disturb();
-
 
         ManaReso.SetSprite("D_FlowerIcon7", ManaGarden.FlowerInfoDic[idList[0]].Icon).Resize(true, 0.85f, 0.85f);
         ManaReso.SetSprite("D_FlowerIcon8", ManaGarden.FlowerInfoDic[idList[1]].Icon).Resize(true, 0.85f, 0.85f);

Assets/Script/Manage/ManaServer.cs

@@ -6,9 +6,11 @@ using UnityEngine.Events;
 
 using System;
 using System.Net;
+using System.Xml;
 using System.Text;
 using System.Net.Mail;
 using System.Collections;
+using System.Collections.Generic;
 
 public class MyCredentials : ICredentialsByHost
 {
@@ -54,11 +56,28 @@ public class ManaServer : Regist
         set { Connect_ = value; }
     }
 
+    public static bool PackLock
+    {
+        get { return PackLock_; }
+        set
+        {
+            PackLock_ = value;
+
+            foreach (var kv in ManaCenter.SkillDic)
+            {
+                if (kv.Value is Pack)
+                {
+                    ((Pack) kv.Value).SetActive(!PackLock_);
+                }
+            }
+        }
+    }
+
     public static bool Connect_;
+    public static bool PackLock_;
 
     public static int Counter;
     public static float Timer;
-    public static bool PackLock;
     public static bool Complete;
     public static bool FirstConnect = true;
 
@@ -113,14 +132,122 @@ public class ManaServer : Regist
         URLRequestData urlData = new URLRequestData();
 
         URLRequest.CreateURLRequest
-            (
-                "https://garden.dashgame.com/index.php/home/index/index",
-                urlData,
-                data =>
+        (
+            "https://garden.dashgame.com/index.php/home/index/index",
+            urlData,
+            data =>
+            {
+                if (data.Inst_Object.ContainsKey("error"))
+                {
+                    if (ManaData.PlayerDoc_ != null)
+                    {
+                        PackLock = ManaData.GetPlayerBool("PackLock");
+                    }
+                }
+                else
                 {
                     PackLock = Auxiliary.BoolParse(data["l"]["val"].ToJson().Trim('"'), true);
+                    
+                    if (ManaData.PlayerDoc_ != null)
+                    {
+                        ManaData.SavePlayerBool("PackLock", PackLock);
+                    }
+                }
+            }
+        );
+    }
+
+    public static void DecodeRewardXml(string rewardXml)
+    {
+        XmlDocument xmlDoc = new XmlDocument();
+
+        xmlDoc.LoadXml(rewardXml);
+
+        XmlNodeList rewardNodeList = xmlDoc.SelectNodes("OneTimeReward");
+
+        List<string> receivedIdList = Auxiliary.StringListParse(' ', ManaData.GetPlayerString("OneTimeReward"), new List<string>());
+
+        for (int i = 0; i < rewardNodeList.Count; i++)
+        {
+            string id = rewardNodeList[i].SelectSingleNode("id").Value;
+
+            if (receivedIdList.Contains(id))
+            {
+                continue;
+            }
+
+            XmlNodeList targetIdNodeList = rewardNodeList[i].SelectSingleNode("targets").SelectNodes("id");
+
+            for (int j = 0; j < targetIdNodeList.Count; j++)
+            {
+                if (targetIdNodeList[i].Value == ID)
+                {
+                    GetReward(rewardNodeList[i].SelectSingleNode("reward"));
+
+                    ManaData.SavePlayerString("OneTimeReward", $"{ManaData.GetPlayerString("OneTimeReward")} id".Trim(' '));
+
+                    break;
                 }
-            );
+            }
+        }
+    }
+
+    public static void GetReward(XmlNode xmlNode)
+    {
+        if (xmlNode.Name == "pack")
+        {
+            UnityAction unityAction;
+
+            if (ManaIAP.ProductActionDic.TryGetValue($"Pack{xmlNode.Value}", out unityAction))
+            {
+                unityAction.Invoke();
+            }
+            else
+            {
+                Debug.LogWarning("Unknown id");
+            }
+        }
+        else if (xmlNode.Name == "close")
+        {
+            int id = int.Parse(xmlNode.Value);
+            CloseUnit closeUnit;
+
+            if (ManaPlayer.CloseUnitDic.TryGetValue(id, out closeUnit))
+            {
+                closeUnit.Unlock();
+
+                ManaPlayer.BoughtCloseList.UniqueAdd(id);
+            }
+            else
+            {
+                Debug.LogWarning("Unknown id");
+            }
+        }
+        else if (xmlNode.Name == "flower")
+        {
+            int id = int.Parse(xmlNode.Value);
+            FlowerInfo flowerInfo;
+
+            if (ManaGarden.FlowerInfoDic.TryGetValue(id, out flowerInfo))
+            {
+                if (flowerInfo.Unlock == false)
+                {
+                    flowerInfo.Unlock = true;
+                }
+            }
+            else
+            {
+                Debug.LogWarning("Unknown id");
+            }
+        }
+        else if (xmlNode.Name == "coin")
+        {
+            ManaCenter.AddCoin(double.Parse(xmlNode.Value), StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.ServerReward);
+        }
+        else if (xmlNode.Name == "diamond")
+        {
+            ManaCenter.AddDiamond(double.Parse(xmlNode.Value), StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.ServerReward);
+        }
     }
 
     public static void GetProductID(string id, URLRequest.URLRequestCallBackDelegate callback)

Assets/Script/Manage/ManaUI.cs

@@ -19,6 +19,7 @@ public class ManaUI : Regist
     public static bool Complete;
 
     public static ManaUI Instance;
+    public static Coroutine StopCreditsCoroutine;
     public static Transform Canvas;
     public static Transform Camera;
     public static Transform Transform;
@@ -1663,6 +1664,7 @@ public class ManaUI : Regist
         ManaLan.Add(ManaReso.Get<Text>("L_MusicLab"), new LanStr("UI", "L_MusicLab"));
         ManaLan.Add(ManaReso.Get<Text>("L_ReportLab"), new LanStr("UI", "L_ReportLab"));
         ManaLan.Add(ManaReso.Get<Text>("L_ChangeLab"), new LanStr("UI", "L_ChangeLab"));
+        ManaLan.Add(ManaReso.Get<Text>("L_CreditsLab"), new LanStr("UI", "L_CreditsLab"));
         ManaLan.Add(ManaReso.Get<Text>("L_ShareLab"), new LanStr("UI", "L_ShareLab"));
         ManaLan.Add(ManaReso.Get<Text>("L_ConfirmLab"), new LanStr("UI", "L_ConfirmLab"));
 
@@ -1680,6 +1682,8 @@ public class ManaUI : Regist
         ManaLan.Add(ManaReso.Get<Text>("Lb_ConfirmLab"), new LanStr("Common", "Confirm"));
         ManaLan.Add(ManaReso.Get<Text>("Lb_Placeholder"), new LanStr("UI", "Lb_Placeholder"));
 
+        ManaLan.Add(ManaReso.Get<Text>("Lc_CreditsContent"), new LanStr("UI", "Lc_CreditsContent"));
+
         ManaReso.SetText("L_UserLab", ManaData.GetPlayerString("ID"));
 
         #region L_Setting
@@ -1714,6 +1718,48 @@ public class ManaUI : Regist
         #endregion
 
 
+        #region L_CreditsMask
+
+        ManaReso.Get("Lc_CreditsMask").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        ManaReso.SetButtonEvent
+        (
+            "Lc_CreditsMask",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                ManaReso.Get("Lc_CreditsMask").TweenBacCG();
+                ManaReso.Get("Lc_CreditsContent").TweenBacCG();
+                
+                Auxiliary.Instance.StopCoroutine(StopCreditsCoroutine);
+            }
+        );
+
+        #endregion
+
+        #region L_CreditsContent
+
+        ManaReso.Get("Lc_CreditsContent").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("Lc_CreditsContent").CreateTweenVec2D(ManaReso.Get("Lc_Pos").position, 10f, false, false, true, Curve.Linear);
+
+        #endregion
+
+        #region L_CreditsBtn
+
+        ManaReso.SetButtonEvent
+        (
+            "L_CreditsBtn",
+            () =>
+            {
+                ShowCredits();
+
+                ManaAudio.PlayClip(Clip.BtnClip);
+            }
+        );
+
+        #endregion
+
 
         #region L_ShareBtn
 
@@ -1728,16 +1774,16 @@ public class ManaUI : Regist
             }
         );
 
-        if (!Application.isMobilePlatform)
+        if (Application.isEditor)
         {
             ManaReso.Get<Button>("L_ShareBtn").interactable = false;
         }
 
         #endregion
 
-            #region L_AudioBtn
+        #region L_AudioBtn
 
-            ManaReso.SetButtonEvent
+        ManaReso.SetButtonEvent
         (
             "L_AudioBtn",
             () =>
@@ -2400,6 +2446,23 @@ public class ManaUI : Regist
     }
 
 
+    public static void ShowCredits()
+    {
+        ManaReso.Get("Lc_CreditsMask").TweenForCG();
+        ManaReso.Get("Lc_CreditsContent").TweenForCG();
+        ManaReso.Get("Lc_CreditsContent").TweenReForVec();
+
+        StopCreditsCoroutine = Auxiliary.Instance.DelayCall
+        (
+            () =>
+            {
+                ManaReso.Get("Lc_CreditsMask").TweenBacCG();
+                ManaReso.Get("Lc_CreditsContent").TweenBacCG();
+            },
+            10f
+        );
+    }
+
     public static void UpdateHint()
     {
         if (ManaTutorial.TutorialA)

Assets/Script/Object/Skill/Pack.cs

@@ -188,10 +188,7 @@ public class Pack : SkillRoot
         ItemStatus = ItemStatus;
 
 
-        if (Lock && ManaServer.PackLock && Level > 0)
-        {
-            Disable();
-        }
+        SetActive(!(Lock && ManaServer.PackLock));
     }
 
     public override void UpdateStatus()
@@ -250,11 +247,23 @@ public class Pack : SkillRoot
         }
     }
 
-    protected void Disable()
+    public void SetActive(bool active)
     {
-        ItemBtn.interactable = false;
+        if (active)
+        {
+            ItemBtn.interactable = true;
+
+            ItemStatus = ItemStatus;
+        }
+        else
+        {
+            if (Level > 0)
+            {
+                ItemBtn.interactable = false;
 
-        ManaLan.Add(ItemBtnLab, Language.GetStr("UI", "Fe_BtnLab9"));
+                ManaLan.Add(ItemBtnLab, Language.GetStr("UI", "Fe_BtnLab9"));
+            }
+        }
     }
 
     protected void OnClick()
@@ -296,11 +305,6 @@ public class Pack : SkillRoot
 
     protected void PurchaseResult()
     {
-        if (Lock && ManaServer.PackLock)
-        {
-            Disable();
-        }
-
         int tempCoin = 0;
         int tempDiamond = (int) DiamondOnce;
 
@@ -383,6 +387,8 @@ public class Pack : SkillRoot
         }
 
         UseA();
+
+        SetActive(!(Lock && ManaServer.PackLock));
     }
 
 

Assets/Script/ThirdParty/DataEyeStatics/StaticsManager.cs

@@ -258,6 +258,7 @@ public class StaticsManager
         Achieve,
         Income,
         ClickFlower,
+        ServerReward,
     }
 
     public static string GetStringByConsumeModule(ConsumeModule module)

Assets/Script/Tool/Anim/TweenRoot.cs

@@ -111,9 +111,6 @@ public abstract class TweenRoot : MoveRoot
 
     public virtual void ReForward()
     {
-        Timer = 0;
-        InOrigin = true;
-
         if (InForward)
         {
             InForward = false;
@@ -128,14 +125,14 @@ public abstract class TweenRoot : MoveRoot
             ManaAnim.MoveBacList.Remove(this);
         }
 
+        Timer = 0;
+        InOrigin = true;
+
         StartForward();
     }
 
     public virtual void ReBackward()
     {
-        Timer = 0;
-        InDestination = true;
-
         if (InForward)
         {
             InForward = false;
@@ -150,6 +147,9 @@ public abstract class TweenRoot : MoveRoot
             ManaAnim.MoveBacList.Remove(this);
         }
 
+        Timer = 0;
+        InDestination = true;
+
         StartBackward();
     }
 

Assets/Script/Tool/AtlasUtil/ExtList.cs

@@ -62,7 +62,7 @@ public static class ExtList
             }
 
             int index = UnityEngine.Random.Range(0, list.Count);
-
+            
             T result = list[index];
 
             if (func != null)

Assets/Script/Tool/Auxiliary.cs

@@ -131,7 +131,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Escape))
         {
-
+            
         }
         
         if (Input.GetKeyDown(KeyCode.N))
@@ -162,7 +162,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            Debug.Log(ManaServer.JsonData.Inst_Object["i"].ToJson().Trim('"'));
+            ManaCenter.MiniTimer = 0;
         }
 
         if (Input.GetKeyDown(KeyCode.X))
@@ -182,7 +182,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-            ManaMiniGame.GameTimer = 45;
+            ManaMiniGame.Score = 1000;
         }
 
         if (Input.GetKeyDown(KeyCode.V))
@@ -455,14 +455,14 @@ public class Auxiliary : Regist
     }
 
 
-    public void DelayCall(UnityAction function, int frame)
+    public Coroutine DelayCall(UnityAction function, int frame)
     {
-        StartCoroutine(IDelayCall(function, frame));
+        return StartCoroutine(IDelayCall(function, frame));
     }
 
-    public void DelayCall(UnityAction function, float time)
+    public Coroutine DelayCall(UnityAction function, float time)
     {
-        StartCoroutine(IDelayCall(function, time));
+        return StartCoroutine(IDelayCall(function, time));
     }
 
 

Assets/Script/Tool/Bundle.cs

@@ -274,11 +274,12 @@ public class Bundle : MonoBehaviour
 
         if (!Logo.Complete && !Initializer.Instance.DebugMode)
         {
-            ManaReso.AddAsyncLoad<TextAsset>("PlayerConfig", Folder.Config, () => { ManaData.PlayerDoc = ManaData.PlayerDoc; });
+            ManaReso.AddAsyncLoad<TextAsset>("PlayerConfig", Folder.Config, () => { ManaData.PlayerDoc = ManaData.PlayerDoc; ManaServer.SetPackLock(); });
         }
         else
         {
             ManaData.PlayerDoc = ManaData.PlayerDoc;
+            ManaServer.SetPackLock();
         }
 
         yield return LoadDiscard();

Assets/Script/Tool/DashGame/URLRequest.cs

@@ -108,7 +108,8 @@ public class URLRequest : MonoBehaviour
 		catch(JsonException e)
 		{
 			Debuger.LogException(e);
-            Debug.Log(e.ToString());
+            //Debug.Log(e.ToString());
+            //Debug.Log(data);
 		}
 		
 		JsonData json = new JsonData();

ToList.txt

@@ -1,6 +1,4 @@
-刚进入游戏UnityIAP回调位置
-
-增加一个制作名单
+服务器奖励
 
 超值热卖的遮挡