提高代码可读性

Assets/Resource/DragonBones/Unity/src/DragonBones/unity/UnityFactory.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace DragonBones
@@ -232,21 +232,21 @@ namespace DragonBones
             if (textureAtlasData.texture == null)
             {
                 //var textureAtlas = Resources.Load<Texture2D>(textureAtlasData.imagePath);
-                Initializer.DebugLab.text = "error : ufr0";
+                Initializer.DebugText.text = "error : ufr0";
                 var textureAtlas = ResourceManager.Load<Texture2D>(BundlePath, Folder.Scene);
-                Initializer.DebugLab.text = "error : ufr1";
+                Initializer.DebugText.text = "error : ufr1";
                 var shader = Shader.Find(defaultShaderName);
-                Initializer.DebugLab.text = "error : ufr2";
+                Initializer.DebugText.text = "error : ufr2";
                 var material = new Material(shader);
-                Initializer.DebugLab.text = "error : ufr3";
+                Initializer.DebugText.text = "error : ufr3";
                 Materials.Add(material);
-                Initializer.DebugLab.text = "error : ufr4";
+                Initializer.DebugText.text = "error : ufr4";
                 material.mainTexture = textureAtlas;
 
-                Initializer.DebugLab.text = "error : ufr5";
+                Initializer.DebugText.text = "error : ufr5";
                 AtlasDictionary.Add(textureAtlas.name, textureAtlas);
 
-                Initializer.DebugLab.text = "error : ufr6";
+                Initializer.DebugText.text = "error : ufr6";
                 textureAtlasData.texture = material;
                 textureAtlasData._disposeTexture = true;
             }
@@ -528,10 +528,10 @@ namespace DragonBones
 
             BundlePath = bundlePath;
 
-            Initializer.DebugLab.text = "error : ufl0";
+            Initializer.DebugText.text = "error : ufl0";
             var textureAtlasData = ParseTextureAtlasData((Dictionary<string, object>)DragonbonesMiniJSON.Json.Deserialize(textureAtlasJSON.text), null, null, 0.0f) as UnityTextureAtlasData;
 
-            Initializer.DebugLab.text = "error : ufl1";
+            Initializer.DebugText.text = "error : ufl1";
             _refreshTextureAtlas(textureAtlasData);
 
             return textureAtlasData;

Assets/Resource/Logo.unity

@@ -155,6 +155,173 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!1 &722194761
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 722194762}
+  - component: {fileID: 722194764}
+  - component: {fileID: 722194763}
+  m_Layer: 5
+  m_Name: DebugText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &722194762
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 722194761}
+  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: 841147524}
+  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!114 &722194763
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 722194761}
+  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: 0.22941172, b: 0.22941172, a: 0}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 25
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!222 &722194764
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 722194761}
+--- !u!1 &841147520
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 841147524}
+  - component: {fileID: 841147523}
+  - component: {fileID: 841147522}
+  - component: {fileID: 841147521}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &841147521
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 841147520}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &841147522
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 841147520}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &841147523
+Canvas:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 841147520}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &841147524
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 841147520}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 722194762}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -240,7 +407,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1511433816
 GameObject:
@@ -325,7 +492,7 @@ Transform:
   m_Children:
   - {fileID: 465425182}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!82 &1511433820
 AudioSource:
@@ -460,5 +627,5 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resource/Prefab/Object/Flower.prefab

@@ -20,7 +20,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4040082670258048}
   m_Layer: 0
-  m_Name: MiniGame
+  m_Name: MiniGamePanel
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -37,7 +37,7 @@ GameObject:
   - component: {fileID: 212608163450142034}
   - component: {fileID: 61672900325532740}
   m_Layer: 0
-  m_Name: GoldBk
+  m_Name: AwardGoldBk
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -52,7 +52,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4361342840831270}
   m_Layer: 0
-  m_Name: GoldBKPosRight
+  m_Name: AwardGoldBkRightPos
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -84,7 +84,7 @@ GameObject:
   - component: {fileID: 4574206532300710}
   - component: {fileID: 212405651425938656}
   m_Layer: 0
-  m_Name: GoldIcon
+  m_Name: AwardGoldIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -116,7 +116,7 @@ GameObject:
   - component: {fileID: 4223213011560790}
   - component: {fileID: 212744417760103780}
   m_Layer: 0
-  m_Name: OperateOutline1
+  m_Name: OperateOutlineParent
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -132,7 +132,7 @@ GameObject:
   - component: {fileID: 4127220911194868}
   - component: {fileID: 212488219047453062}
   m_Layer: 0
-  m_Name: OperateOutline2
+  m_Name: OperateOutline0
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -147,7 +147,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4228187096892176}
   m_Layer: 0
-  m_Name: GoldBKPosLeft
+  m_Name: AwardGoldBkLeftPos
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -180,7 +180,7 @@ GameObject:
   - component: {fileID: 198104612344300876}
   - component: {fileID: 199113240860977472}
   m_Layer: 0
-  m_Name: Particle System
+  m_Name: ParticleSystem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -229,7 +229,7 @@ GameObject:
   - component: {fileID: 4759283828233202}
   - component: {fileID: 212136457446712406}
   m_Layer: 0
-  m_Name: OperateBk
+  m_Name: OperatePanelBk
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -244,7 +244,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4632147127767938}
   m_Layer: 0
-  m_Name: ScorePosTra
+  m_Name: ScorePos
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -276,7 +276,7 @@ GameObject:
   - component: {fileID: 4916747695851704}
   - component: {fileID: 95954306107774232}
   m_Layer: 0
-  m_Name: FlowerAc
+  m_Name: FlowerAnimator
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -307,7 +307,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4301854861422504}
   m_Layer: 0
-  m_Name: GoldPosTra
+  m_Name: AwardGoldPos
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -323,7 +323,7 @@ GameObject:
   - component: {fileID: 4752825203280896}
   - component: {fileID: 212406633043839918}
   m_Layer: 0
-  m_Name: OperateOutline3
+  m_Name: OperateOutline1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Resource/Prefab/Object/Garden.prefab

@@ -37,7 +37,7 @@ GameObject:
   - component: {fileID: 4896451008180992}
   - component: {fileID: 212319376484865296}
   m_Layer: 0
-  m_Name: Tree2
+  m_Name: GardenLeftTree
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -68,7 +68,7 @@ GameObject:
   - component: {fileID: 4929027059194764}
   - component: {fileID: 212704068213746162}
   m_Layer: 0
-  m_Name: Cloud3
+  m_Name: GardenCloud3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -99,7 +99,7 @@ GameObject:
   - component: {fileID: 4321706706442504}
   - component: {fileID: 212309050241798670}
   m_Layer: 0
-  m_Name: Tree1
+  m_Name: GardenRightTree
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -115,7 +115,7 @@ GameObject:
   - component: {fileID: 4732436779443374}
   - component: {fileID: 212306657225187814}
   m_Layer: 0
-  m_Name: Bird0
+  m_Name: BirdPivot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -146,7 +146,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4686788189379672}
   m_Layer: 0
-  m_Name: SlotMini6
+  m_Name: MinigameSlot6
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -161,7 +161,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4342108832289114}
   m_Layer: 0
-  m_Name: SlotMini7
+  m_Name: MinigameSlot7
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -192,7 +192,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4331496475013004}
   m_Layer: 0
-  m_Name: SlotMini5
+  m_Name: MinigameSlot5
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -224,7 +224,7 @@ GameObject:
   - component: {fileID: 4750662320858086}
   - component: {fileID: 212548306413466646}
   m_Layer: 0
-  m_Name: Rainbow
+  m_Name: GardenRainbow
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -256,7 +256,7 @@ GameObject:
   - component: {fileID: 4660768198459142}
   - component: {fileID: 212394763641946984}
   m_Layer: 0
-  m_Name: Cloud1
+  m_Name: GardenCloud1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -271,7 +271,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4087460571628550}
   m_Layer: 0
-  m_Name: SlotMini3
+  m_Name: MinigameSlot3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -286,7 +286,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4771305799930198}
   m_Layer: 0
-  m_Name: GardenPage
+  m_Name: SlotPage
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -301,7 +301,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4351766612335960}
   m_Layer: 0
-  m_Name: PlayerPosTra
+  m_Name: GardenPlayerPos
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -316,7 +316,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4134291750328924}
   m_Layer: 0
-  m_Name: MiniLeft
+  m_Name: Minigame_DropAward_LeftBorder
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -379,7 +379,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4576759688754552}
   m_Layer: 0
-  m_Name: GardenNormal
+  m_Name: GardenPivot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -410,7 +410,7 @@ GameObject:
   - component: {fileID: 4595340951015810}
   - component: {fileID: 212537051338820940}
   m_Layer: 0
-  m_Name: Cloud2
+  m_Name: GardenCloud2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -426,7 +426,7 @@ GameObject:
   - component: {fileID: 4836477063204880}
   - component: {fileID: 95656197025045548}
   m_Layer: 0
-  m_Name: Bird1
+  m_Name: BirdParent
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -458,7 +458,7 @@ GameObject:
   - component: {fileID: 212354945701907106}
   - component: {fileID: 61724106738148120}
   m_Layer: 0
-  m_Name: GardenMini
+  m_Name: Minigame
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -473,7 +473,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4511888384554322}
   m_Layer: 0
-  m_Name: SlotMini8
+  m_Name: MinigameSlot8
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -518,7 +518,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4254189633300472}
   m_Layer: 0
-  m_Name: SlotMini2
+  m_Name: MinigameSlot2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -533,7 +533,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4210403526360216}
   m_Layer: 0
-  m_Name: SlotMini1
+  m_Name: MinigameSlot1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -548,7 +548,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4117016694580252}
   m_Layer: 0
-  m_Name: MiniPos
+  m_Name: MinigameLeftPos
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -563,7 +563,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4276179709011602}
   m_Layer: 0
-  m_Name: MiniRight2
+  m_Name: MemoryMinigame_DropAward_RightBorder
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -578,7 +578,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4587352699038540}
   m_Layer: 0
-  m_Name: SlotMini4
+  m_Name: MinigameSlot4
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -609,7 +609,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4562429071468692}
   m_Layer: 0
-  m_Name: SlotMini9
+  m_Name: MinigameSlot9
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -624,7 +624,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4798948200544626}
   m_Layer: 0
-  m_Name: MiniRight1
+  m_Name: FindMinigame_DropAward_RightBorder
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Resource/Prefab/PrefabUI/CommentItem.prefab

@@ -22,7 +22,7 @@ GameObject:
   - component: {fileID: 222406504289961844}
   - component: {fileID: 114098198944178808}
   m_Layer: 5
-  m_Name: VisitLab
+  m_Name: VisitButtonTitle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -71,7 +71,7 @@ GameObject:
   - component: {fileID: 222846138815763298}
   - component: {fileID: 114218369184391990}
   m_Layer: 5
-  m_Name: ContentLab
+  m_Name: Content
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -89,7 +89,7 @@ GameObject:
   - component: {fileID: 114327637007703412}
   - component: {fileID: 114803250711698834}
   m_Layer: 5
-  m_Name: VisitBtn
+  m_Name: VisitButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -106,7 +106,7 @@ GameObject:
   - component: {fileID: 222485822225150920}
   - component: {fileID: 114366770783175640}
   m_Layer: 5
-  m_Name: Tit
+  m_Name: Title
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -305,7 +305,7 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
-  Draw: 1
+  Draw: 0
 --- !u!114 &114803250711698834
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Resource/Prefab/PrefabUI/FlowerItem.prefab

@@ -41,7 +41,7 @@ GameObject:
   - component: {fileID: 199176778590411972}
   - component: {fileID: 198999599110872962}
   m_Layer: 5
-  m_Name: UIParticle System
+  m_Name: UIParticleSystem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -58,7 +58,7 @@ GameObject:
   - component: {fileID: 222137134951818316}
   - component: {fileID: 114454811348864648}
   m_Layer: 5
-  m_Name: AmtLab
+  m_Name: Amount
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -108,7 +108,7 @@ GameObject:
   - component: {fileID: 222348155467417056}
   - component: {fileID: 114261472970502356}
   m_Layer: 5
-  m_Name: Lab
+  m_Name: Status
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -123,7 +123,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224841882690309920}
   m_Layer: 5
-  m_Name: Arrow0
+  m_Name: ArrowPos
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Resource/Prefab/PrefabUI/MailItem.prefab

@@ -90,7 +90,7 @@ GameObject:
   - component: {fileID: 222091847606569542}
   - component: {fileID: 114444284200601094}
   m_Layer: 5
-  m_Name: Lab
+  m_Name: Title
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Resource/Prefab/PrefabUI/PlazaRoomItem.prefab

@@ -56,7 +56,7 @@ GameObject:
   - component: {fileID: 222994722465461070}
   - component: {fileID: 114497160166506218}
   m_Layer: 5
-  m_Name: Img0
+  m_Name: SystemIconBK
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -124,7 +124,7 @@ GameObject:
   - component: {fileID: 222961288381543224}
   - component: {fileID: 114180205485435502}
   m_Layer: 5
-  m_Name: Img1
+  m_Name: SystemIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Resource/Prefab/PrefabUI/RankItem.prefab

@@ -39,7 +39,7 @@ GameObject:
   - component: {fileID: 222387172840718572}
   - component: {fileID: 114312663896254328}
   m_Layer: 5
-  m_Name: Tit
+  m_Name: Title
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -71,7 +71,7 @@ GameObject:
   - component: {fileID: 222205936617307006}
   - component: {fileID: 114880801038391646}
   m_Layer: 5
-  m_Name: VisitLab
+  m_Name: VisitText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -106,7 +106,7 @@ GameObject:
   - component: {fileID: 222222569539418164}
   - component: {fileID: 114172654563294026}
   m_Layer: 5
-  m_Name: PraiseLab
+  m_Name: PraiseText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -140,7 +140,7 @@ GameObject:
   - component: {fileID: 222303595506225802}
   - component: {fileID: 114637003617785456}
   m_Layer: 5
-  m_Name: TitBK
+  m_Name: TitleBK
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -157,7 +157,7 @@ GameObject:
   - component: {fileID: 222587372046337076}
   - component: {fileID: 114945703290339750}
   m_Layer: 5
-  m_Name: ContentLab
+  m_Name: ContentText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Resource/Prefab/PrefabUI/SignItem.prefab

@@ -22,7 +22,7 @@ GameObject:
   - component: {fileID: 222879510851276244}
   - component: {fileID: 114596327173286554}
   m_Layer: 5
-  m_Name: Icon1
+  m_Name: Award
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -39,7 +39,7 @@ GameObject:
   - component: {fileID: 222985943880051524}
   - component: {fileID: 114813271225358564}
   m_Layer: 5
-  m_Name: Lab1
+  m_Name: Amount
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -56,7 +56,7 @@ GameObject:
   - component: {fileID: 222066560283461788}
   - component: {fileID: 114380263446484376}
   m_Layer: 5
-  m_Name: Lab2
+  m_Name: Index
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -90,7 +90,7 @@ GameObject:
   - component: {fileID: 222920375651672332}
   - component: {fileID: 114159795022155342}
   m_Layer: 5
-  m_Name: Icon2
+  m_Name: Tick
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Resource/Prefab/PrefabUI/SkillItem.prefab

@@ -20,7 +20,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224762394635763476}
   m_Layer: 5
-  m_Name: Arrow0
+  m_Name: ArrowPosition
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -37,7 +37,7 @@ GameObject:
   - component: {fileID: 222413845689952188}
   - component: {fileID: 114790753628481082}
   m_Layer: 5
-  m_Name: Lab
+  m_Name: Description
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -54,7 +54,7 @@ GameObject:
   - component: {fileID: 222366561853418940}
   - component: {fileID: 114977137437254298}
   m_Layer: 0
-  m_Name: ImagePlusLab
+  m_Name: ImagePlus
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -72,7 +72,7 @@ GameObject:
   - component: {fileID: 114205686491865548}
   - component: {fileID: 114852074207498102}
   m_Layer: 5
-  m_Name: Btn
+  m_Name: Button
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -89,7 +89,7 @@ GameObject:
   - component: {fileID: 222270481494867574}
   - component: {fileID: 114799092303750802}
   m_Layer: 5
-  m_Name: IconLab1
+  m_Name: LabelText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -106,7 +106,7 @@ GameObject:
   - component: {fileID: 222742914547498580}
   - component: {fileID: 114302263029701916}
   m_Layer: 5
-  m_Name: Icon
+  m_Name: SkillIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -123,7 +123,7 @@ GameObject:
   - component: {fileID: 222540567465174682}
   - component: {fileID: 114296053309148406}
   m_Layer: 5
-  m_Name: Tit
+  m_Name: Title
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -155,7 +155,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224837192284127996}
   m_Layer: 5
-  m_Name: Arrow1
+  m_Name: ArrowDestination
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -172,7 +172,7 @@ GameObject:
   - component: {fileID: 222880361306575966}
   - component: {fileID: 114122989000428900}
   m_Layer: 5
-  m_Name: BtnLab
+  m_Name: ButtonTitle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -189,7 +189,7 @@ GameObject:
   - component: {fileID: 222657493250765514}
   - component: {fileID: 114823576705235868}
   m_Layer: 5
-  m_Name: Icon1
+  m_Name: LabelIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Resource/XML/Config/ability_config.xml

@@ -1,6 +1,6 @@
 <data>
   <item id="1" name="花园" class="1" class_id="1" coin_person="5" person="1" skill_cd="" unlock_lv="" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="1" unlock_amnt="5" unlock_pos="" upgrade_cur="1" upgrade_amnt="800" upgrade_fml="a*1.07" upgrade_plus="0.5%" upgrade_person="1.7%" upgrade_cd="" desc="每人次收入 金币[&amp;coin_person&amp;][lv]，每分钟来访[&amp;person&amp;*60][lv]人" icon="红-公园" anim="" label="" />
-  <item id="2" name="缤纷彩虹" class="1" class_id="5" coin_person="" person="5%" skill_cd="" unlock_lv="5" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="200" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="" upgrade_person="5%" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60][lv]人参观，永久有效" icon="红-彩虹" anim="Item,Rainbow" label="" />
+  <item id="2" name="缤纷彩虹" class="1" class_id="5" coin_person="" person="5%" skill_cd="" unlock_lv="5" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="200" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="" upgrade_person="5%" upgrade_cd="" desc="每分钟增加[&amp;person&amp;*60][lv]人参观，永久有效" icon="红-彩虹" anim="Item,GardenRainbow" label="" />
   <item id="3" name="玉树樱花" class="1" class_id="6" coin_person="5%" person="" skill_cd="" unlock_lv="35" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="300" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="150" upgrade_fml="a" upgrade_plus="5%" upgrade_person="" upgrade_cd="" desc="每人次收入提升[&amp;coin_person&amp;][lv]，永久有效" icon="红-樱花树" anim="Item,GardenLeftTree,GardenRightTree" label="" />
   <item id="4" name="滴哩哩的小黄鹂" class="1" class_id="7" coin_person="" person="" skill_cd="5%" unlock_lv="110" unlock_ahead_cur="2" unlock_ahead_delta="1" unlock_ahead_minimun="500" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="2" upgrade_amnt="300" upgrade_fml="a" upgrade_plus="" upgrade_person="" upgrade_cd="5%" desc="技能冷却时间减少[&amp;skill_cd&amp;][lv]，永久有效" icon="红-黄鹂鸟" anim="Item,BirdPivot" label="" />
   <item id="5" name="黄色小蜜蜂" class="2" class_id="1" coin_person="2.07" person="" skill_cd="" unlock_lv="2" unlock_ahead_cur="" unlock_ahead_delta="" unlock_ahead_minimun="" unlock_cur="" unlock_amnt="" unlock_pos="" upgrade_cur="1" upgrade_amnt="1600" upgrade_fml="a*1.07" upgrade_plus="2%" upgrade_person="" upgrade_cd="" desc="每人次参观获得[&amp;coin_person&amp;][lv]金币" icon="黄-黄色蜜蜂" anim="Elf,Bee_Yellow" label="" />

Assets/Script/Function/ThanksGift.cs

@@ -115,13 +115,13 @@ public class Gift
 
     public void GetAllGift()
     {
-        if (HttpManager.Time > EndDate)
+        if (HttpManager.CurrentDateTime > EndDate)
         {
             //Debug.Log("has't start");
             return;
         }
 
-        if (HttpManager.Time < StartDate)
+        if (HttpManager.CurrentDateTime < StartDate)
         {
             //Debug.Log("over");
             return;
@@ -152,8 +152,8 @@ public class Gift
         }
         else if (type == GiftType.服装)
         {
-            CloseItem closeItem = PlayerManager.CloseItemDic[value];
-            if (closeItem.Possess)
+            CloseItem closeItem = PlayerManager.CloseItemDictionary[value];
+            if (closeItem.IsBought)
             {
                 /*ExchangeInfo info = */closeItem.GetExchangeValue(CloseExchangeRatio, StaticsManager.ConsumeModule.Gift);
                 //Debug.LogWarning($"{type} {info.Current} {info.Value}");
@@ -167,13 +167,13 @@ public class Gift
         else if (type == GiftType.礼包)
         {
             string packID = SkillConfigLabel.GetFullID(SkillType.Pack, value);
-            (Manager.SkillDic[packID] as Pack).OnBuySucceed(false);
+            (Manager.SkillDictionary[packID] as Pack).OnBuySucceed(false);
             //Debug.LogWarning($"{type} {SkillConfigLabel.Pack + value}");
         }
         else if (type == GiftType.精灵)
         {
             string abilityID = SkillConfigLabel.GetFullID(SkillType.Ability, value);
-            Ability ability = Manager.SkillDic[abilityID] as Ability;
+            Ability ability = Manager.SkillDictionary[abilityID] as Ability;
             if (ability.ItemStatus == SkillStatus.Lock)
             {
                 /*ExchangeInfo info = */ability.GetUnlockAheadExchangeValue(AbilityExchangeRatio, StaticsManager.ConsumeModule.Gift);
@@ -192,7 +192,7 @@ public class Gift
         }
         else if (type == GiftType.花朵)
         {
-            FlowerInfo flowerInfo = GardenManager.FlowerInfoDic[value];
+            FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[value];
             flowerInfo.Add();
             //if (!flowerInfo.Unlock)
             //{

Assets/Script/Manage/AchieveManager.cs

@@ -22,14 +22,14 @@ public enum AchieveType
     SignAmt,
     CloseAmt,
     ShareAmt,
-    FlowerAmt,
+    UnlockFlowerAmt,
     PlayMinigameAmt,
 
     TotalCoin,
     TotalFlowerAwardCoin,
     CurrentCoin,
 
-    SpendDiamond,
+    TotalSpendDiamond,
 
     CreateRoomAmt,
     CreateChestAmt,
@@ -209,23 +209,23 @@ public class AchieveItem
     {
         if (AchieveType == AchieveType.TotalVisitPerson)
         {
-            UpdateStatus(Manager.TotalPerson);
+            UpdateStatus(Manager.TotalVisitPerson);
         }
         else if (AchieveType == AchieveType.AllElfLevel)
         {
-            UpdateStatus(Manager.ElfLevel);
+            UpdateStatus(Manager.AllElfLevel);
         }
         else if (AchieveType == AchieveType.GardenLevel)
         {
-            UpdateStatus(Manager.Level);
+            UpdateStatus(Manager.GardenLevel);
         }
         else if (AchieveType == AchieveType.PlayADsAmt)
         {
-            UpdateStatus(Manager.AdAmt);
+            UpdateStatus(Manager.PlayADsAmt);
         }
         else if (AchieveType == AchieveType.UseSkillAmt)
         {
-            UpdateStatus(Manager.SkillAmt);
+            UpdateStatus(Manager.UseSkillAmt);
         }
         else if (AchieveType == AchieveType.SignAmt)
         {
@@ -235,13 +235,13 @@ public class AchieveItem
         {
             UpdateStatus(Manager.ShareAmt);
         }
-        else if (AchieveType == AchieveType.FlowerAmt)
+        else if (AchieveType == AchieveType.UnlockFlowerAmt)
         {
-            UpdateStatus(GardenManager.MyFlower);
+            UpdateStatus(GardenManager.TotalUnlockFlower);
         }
         else if (AchieveType == AchieveType.PlayMinigameAmt)
         {
-            UpdateStatus(Manager.MiniGameAmt);
+            UpdateStatus(Manager.PlayMinigameAmt);
         }
         else if (AchieveType == AchieveType.TotalCoin)
         {
@@ -249,15 +249,15 @@ public class AchieveItem
         }
         else if (AchieveType == AchieveType.TotalFlowerAwardCoin)
         {
-            UpdateStatus(Manager.FlowerCoin);
+            UpdateStatus(Manager.TotalFlowerAwardCoin);
         }
         else if (AchieveType == AchieveType.CurrentCoin)
         {
             UpdateStatus(Manager.Coin);
         }
-        else if (AchieveType == AchieveType.SpendDiamond)
+        else if (AchieveType == AchieveType.TotalSpendDiamond)
         {
-            UpdateStatus(Manager.CostDiamond);
+            UpdateStatus(Manager.TotalSpendDiamond);
         }
         else if (AchieveType == AchieveType.CloseAmt)
         {
@@ -449,7 +449,7 @@ public class AchieveItem
         }
         else if (integer == 5)
         {
-            return AchieveType.FlowerAmt;
+            return AchieveType.UnlockFlowerAmt;
         }
         else if (integer == 6)
         {
@@ -481,7 +481,7 @@ public class AchieveItem
         }
         else if (integer == 13)
         {
-            return AchieveType.SpendDiamond;
+            return AchieveType.TotalSpendDiamond;
         }
         else if (integer == 14)
         {

Assets/Script/Manage/AnnounceManager.cs

@@ -54,7 +54,7 @@ public class AnnounceManager
                 transform.GetComponent<Text>().resizeTextForBestFit = false;
                 transform.GetComponent<ContentSizeFitter>().enabled = true;
 
-                transform.GetChild(0).GetComponent<Image>().sprite = HttpManager.NotificationSprite;
+                transform.GetChild(0).GetComponent<Image>().sprite = HttpManager.AnnounceSpite;
             }
 
             transform.GetComponent<Text>().text = contents[i].content;

Assets/Script/Manage/AudioManager.cs

@@ -233,7 +233,7 @@ public class AudioManager : Regist
         {
             Mark: yield return null;
 
-            while (Manager.Background)
+            while (Manager.InBackground)
             {
                 goto Mark;
             }

Assets/Script/Manage/ConfigManager.cs

@@ -161,7 +161,7 @@ public class ConfigManager : Regist
                     {
                         configDocument = UpdateConfigDocument(nativeVersion, nativeDoc, DefaultConfigDocument);
 
-                        HttpManager.Save();
+                        HttpManager.UploadConfig();
                     }
                 }
                 else if (nativeVersion > defaultVersion)
@@ -233,7 +233,7 @@ public class ConfigManager : Regist
             {
                 SerialNumberRequestFlag = true;
 
-                HttpManager.DownloadBySerialNumber(HttpManager.SerialNumber, RecoveConfigDocument);
+                HttpManager.GetConfigBySerialNumber(HttpManager.SerialNumber, RecoveConfigDocument);
             }
         }
     }
@@ -275,7 +275,7 @@ public class ConfigManager : Regist
             {
                 UpdateConfigDocument(nativeVersion, configDocument, DefaultConfigDocument);
 
-                HttpManager.Save();
+                HttpManager.UploadConfig();
             }
             else if (nativeVersion > defaultVersion)
             {
@@ -293,7 +293,7 @@ public class ConfigManager : Regist
                     IDRequestFlag = true;
                     Debug.LogWarning("DownloadByID");
 
-                    HttpManager.DownloadByID(HttpManager.ID, RecoveConfigDocument);
+                    HttpManager.GetConfigByID(HttpManager.ID, RecoveConfigDocument);
                 }
                 else
                 {
@@ -314,7 +314,7 @@ public class ConfigManager : Regist
 
     public static void SaveSkillList()
     {
-        if (TutorialManager.NewplayerTutorial || !Manager.Complete)
+        if (TutorialManager.NewplayerTutorial || !Manager.Inited)
         {
             return;
         }
@@ -446,9 +446,9 @@ public class ConfigManager : Regist
         XmlNode xmlNode = ConfigRootNode.SelectSingleNode(PlayerConfigLabel.DressList);
         xmlNode.Attributes[0].Value = "";
 
-        for (int i = 0; i < PlayerManager.BoughtCloseList.Count; i++)
+        for (int i = 0; i < PlayerManager.BoughtCloseIDs.Count; i++)
         {
-            xmlNode.Attributes[0].Value += PlayerManager.BoughtCloseList[i] + " ";
+            xmlNode.Attributes[0].Value += PlayerManager.BoughtCloseIDs[i] + " ";
         }
 
         xmlNode.Attributes[0].Value = xmlNode.Attributes[0].Value.TrimEnd(' ');
@@ -456,9 +456,9 @@ public class ConfigManager : Regist
 
         xmlNode = ConfigRootNode.SelectSingleNode(PlayerConfigLabel.DressData);
 
-        for (int i = 0; i < PlayerManager.DressData.Count; i++)
+        for (int i = 0; i < PlayerManager.DressDatas.Count; i++)
         {
-            xmlNode.Attributes[i].Value = PlayerManager.DressData[i];
+            xmlNode.Attributes[i].Value = PlayerManager.DressDatas[i];
         }
     }
 
@@ -478,15 +478,15 @@ public class ConfigManager : Regist
         xmlNode.Attributes[0].Value = xmlNode.Attributes[0].Value.TrimEnd(' ');
 
 
-        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[0].Value = Manager.AdAmt.ToString("0");
-        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[1].Value = Manager.SkillAmt.ToString("0");
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[0].Value = Manager.PlayADsAmt.ToString("0");
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[1].Value = Manager.UseSkillAmt.ToString("0");
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[2].Value = Manager.SignAmt.ToString("0");
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[3].Value = Manager.ShareAmt.ToString("0");
-        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[4].Value = Manager.ElfLevel.ToString("0");
-        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[5].Value = Manager.MiniGameAmt.ToString("0");
-        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[6].Value = Manager.FlowerCoin.ToString("0");
-        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[7].Value = Manager.TotalPerson.ToString("0");
-        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[8].Value = Manager.CostDiamond.ToString("0");
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[4].Value = Manager.AllElfLevel.ToString("0");
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[5].Value = Manager.PlayMinigameAmt.ToString("0");
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[6].Value = Manager.TotalFlowerAwardCoin.ToString("0");
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[7].Value = Manager.TotalVisitPerson.ToString("0");
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[8].Value = Manager.TotalSpendDiamond.ToString("0");
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[9].Value = Manager.CreateRoomAmt.ToString("0");
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[10].Value = Manager.CreateChestAmt.ToString("0");
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.AchieveData).Attributes[11].Value = Manager.CreateLuckyChestAmt.ToString("0");
@@ -506,9 +506,9 @@ public class ConfigManager : Regist
 
         attribute[0].Value = "";
 
-        for (int i = 0; i < GardenManager.PlantList.Count; i++)
+        for (int i = 0; i < GardenManager.PlantSlotList.Count; i++)
         {
-            Slot slot = GardenManager.PlantList[i];
+            Slot slot = GardenManager.PlantSlotList[i];
             
             attribute[0].Value += slot.ID + "," + slot.Index + " ";
         }
@@ -521,15 +521,15 @@ public class ConfigManager : Regist
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.Coin).Attributes[0].Value = Manager.Coin.ToString("0");
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.Diamond).Attributes[0].Value = Manager.Diamond.ToString("0");
         
-        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.SignTime).Attributes[0].Value = SignManager.SignTime.ToString();
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.SignTime).Attributes[0].Value = SignManager.LastSignTime.ToString();
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.SignIndex).Attributes[0].Value = SignManager.SignIndex.ToString();
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.SignRound).Attributes[0].Value = SignManager.SignRound.ToString();
         
-        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.QuitFlag).Attributes[0].Value = HttpManager.Connect.ToInt().ToString();
-        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.QuitTime).Attributes[0].Value = HttpManager.Time.ToString();
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.QuitFlag).Attributes[0].Value = HttpManager.IsConnect.ToInt().ToString();
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.QuitTime).Attributes[0].Value = HttpManager.CurrentDateTime.ToString();
 
-        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.MiniTimer).Attributes[0].Value = Manager.MiniTimer.ToString("0");
-        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.CircleTimer).Attributes[0].Value = Manager.CircleTimer.ToString("0");
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.MiniTimer).Attributes[0].Value = Manager.MinigameCDTimer.ToString("0");
+        ConfigRootNode.SelectSingleNode(PlayerConfigLabel.CircleTimer).Attributes[0].Value = Manager.IncomeCircleTimer.ToString("0");
 
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.ID).Attributes[0].Value = HttpManager.ID;
         ConfigRootNode.SelectSingleNode(PlayerConfigLabel.SerialNumber).Attributes[0].Value = HttpManager.SerialNumber;
@@ -560,11 +560,11 @@ public class ConfigManager : Regist
         attribute.Value = "";
         attribute1.Value = "";
 
-        foreach (var kv in GardenManager.FlowerInfoDic)
+        foreach (var kv in GardenManager.FlowerInfoDictionary)
         {
             if (kv.Value.Unlock)
             {
-                attribute.Value += kv.Value.ID_ + " ";
+                attribute.Value += kv.Value.ID + " ";
                 attribute1.Value += kv.Value.Amount + " ";
             }
         }
@@ -575,7 +575,7 @@ public class ConfigManager : Regist
 
     public static void SaveConfigDocument()
     {
-        if (Initializer.Complete)
+        if (Initializer.Inited)
         {
             SaveSkillList();
             SaveAchieve();
@@ -589,7 +589,7 @@ public class ConfigManager : Regist
 
     public static void SaveConfigDocumentToDisk()
     {
-        if (Initializer.Complete)
+        if (Initializer.Inited)
         {
             XmlDocument doc = new XmlDocument();
 
@@ -619,7 +619,7 @@ public class ConfigManager : Regist
 
         SaveConfigDocument();
 
-        Manager.SaveLock = true;
+        Manager.UploadConfigFlag = true;
 
         SaveConfigDocumentToDisk();
 
@@ -708,14 +708,14 @@ public class ConfigManager : Regist
 
         List<int> dressDataIDs = new List<int>();
 
-        dressDataIDs.Add(PlayerManager.CloseIDDic[player.Head]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[player.Dress]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[player.Shoe]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[player.HeadWear]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[player.Top]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[player.Eye]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[player.Mouse]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[player.Wing]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[player.Head]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[player.Dress]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[player.Shoe]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[player.HeadWear]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[player.Top]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[player.Eye]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[player.Mouse]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[player.Wing]);
 
         return dressDataIDs;
     }
@@ -730,14 +730,14 @@ public class ConfigManager : Regist
         List<int> dressDataIDs = new List<int>();
 
         int index = 0;
-        dressDataIDs.Add(PlayerManager.CloseIDDic[dressdataNames[index++]]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[dressdataNames[index++]]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[dressdataNames[index++]]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[dressdataNames[index++]]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[dressdataNames[index++]]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[dressdataNames[index++]]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[dressdataNames[index++]]);
-        dressDataIDs.Add(PlayerManager.CloseIDDic[dressdataNames[index++]]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[dressdataNames[index++]]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[dressdataNames[index++]]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[dressdataNames[index++]]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[dressdataNames[index++]]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[dressdataNames[index++]]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[dressdataNames[index++]]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[dressdataNames[index++]]);
+        dressDataIDs.Add(PlayerManager.CloseIDDictionary[dressdataNames[index++]]);
 
         return dressDataIDs;
     }
@@ -757,7 +757,7 @@ public class ConfigManager : Regist
 
         foreach (var id in ids)
         {
-            dressData.Add(PlayerManager.CloseItemDic[id].ArmatureName);
+            dressData.Add(PlayerManager.CloseItemDictionary[id].ArmatureName);
         }
 
         return dressData;

Assets/Script/Manage/GardenManager.cs

@@ -31,24 +31,24 @@ public class GardenLabel
     public static string GardenRightTree = "GardenRightTree";
     public static string GardenRainbow = "GardenRainbow";
 
-    public static string GardenMini = "GardenMini";
-    public static string SlotPage = "GardenPage";
-    public static string GardenNormal = "GardenNormal";
-    public static string PlayerPosTra = "PlayerPosTra";
-
-    public static string MiniLeft = "MiniLeft";
-    public static string MiniRight1 = "MiniRight1";
-    public static string MiniRight2 = "MiniRight2";
-
-    public static string SlotMini1 = "SlotMini1";
-    public static string SlotMini2 = "SlotMini2";
-    public static string SlotMini3 = "SlotMini3";
-    public static string SlotMini4 = "SlotMini4";
-    public static string SlotMini5 = "SlotMini5";
-    public static string SlotMini6 = "SlotMini6";
-    public static string SlotMini7 = "SlotMini7";
-    public static string SlotMini8 = "SlotMini8";
-    public static string SlotMini9 = "SlotMini9";
+    public static string Minigame = "Minigame";
+    public static string SlotPage = "SlotPage";
+    public static string GardenPivot = "GardenPivot";
+    public static string GardenPlayerPos = "GardenPlayerPos";
+
+    public static string Minigame_DropAward_LeftBorder = "Minigame_DropAward_LeftBorder";
+    public static string FindMinigame_DropAward_RightBorder = "FindMinigame_DropAward_RightBorder";
+    public static string MemoryMinigame_DropAward_RightBorder = "MemoryMinigame_DropAward_RightBorder";
+
+    public static string MinigameSlot1 = "MinigameSlot1";
+    public static string MinigameSlot2 = "MinigameSlot2";
+    public static string MinigameSlot3 = "MinigameSlot3";
+    public static string MinigameSlot4 = "MinigameSlot4";
+    public static string MinigameSlot5 = "MinigameSlot5";
+    public static string MinigameSlot6 = "MinigameSlot6";
+    public static string MinigameSlot7 = "MinigameSlot7";
+    public static string MinigameSlot8 = "MinigameSlot8";
+    public static string MinigameSlot9 = "MinigameSlot9";
 }
 
 public enum ElfType
@@ -79,33 +79,36 @@ public class GardenManager : Regist
 {
     #region Config
 
-    public static int Slot
+    public static int TotalSlot
     {
-        get { return Slot_; }
+        get { return totalSlot; }
         set
         {
-            Slot_ = value;
+            totalSlot = value;
 
-            ResourceManager.SetText(ObjectLabel.G_CollectLab2, string.Format("{0}/{1}", Slot_, Page * TotalSlotAmtInOnePage));
+            ResourceManager.SetText(ObjectLabel.G_CollectLab2, string.Format("{0}/{1}", totalSlot, TotalSlotPage * TotalSlotInOnePage));
         }
     }
-    public static int Page
+    public static int totalSlot;
+
+    public static int TotalSlotPage
     {
-        get { return PageList.Count; }
+        get { return SlotPageList.Count; }
     }
-    public static int MyFlower
+
+    public static int TotalUnlockFlower
     {
-        get { return MyFlower_; }
+        get { return totalUnlockFlower; }
         set
         {
-            MyFlower_ = value;
+            totalUnlockFlower = value;
 
-            AchieveManager.UpdateStatus(AchieveType.FlowerAmt, MyFlower_);
+            AchieveManager.UpdateStatus(AchieveType.UnlockFlowerAmt, totalUnlockFlower);
 
-            ResourceManager.SetText(ObjectLabel.F_FlowerLab, string.Format("{0}", MyFlower));
-            ResourceManager.SetText(ObjectLabel.G_CollectLab1, string.Format("{0}/{1}", MyFlower, TotalFlower));
+            ResourceManager.SetText(ObjectLabel.F_FlowerLab, string.Format("{0}", TotalUnlockFlower));
+            ResourceManager.SetText(ObjectLabel.G_CollectLab1, string.Format("{0}/{1}", TotalUnlockFlower, TotalFlower));
 
-            if (MyFlower_ >= TutorialManager.MinFlowerForFindGame && Manager.Level >= TutorialManager.FindMinigameTutorialLevel)
+            if (totalUnlockFlower >= TutorialManager.MinFlowerForFindGame && Manager.GardenLevel >= TutorialManager.FindMinigameTutorialLevel)
             {
                 if (TutorialManager.findMinigameTutorial)
                 {
@@ -114,60 +117,64 @@ public class GardenManager : Regist
             }
         }
     }
-    public static int MyFlowerSpec
+    private static int totalUnlockFlower;
+
+    public static int TotalUnlockSpecialFlower
     {
-        get { return MyFlowerSpec_; }
+        get { return totalUnlockSpecialFlower; }
         set
         {
-            MyFlowerSpec_ = value;
+            totalUnlockSpecialFlower = value;
 
-            MyFlower = MyFlowerSpec_ + MyFlowerRegu_;
+            TotalUnlockFlower = totalUnlockSpecialFlower + totalUnlockNormalFlower;
         }
     }
-    public static int MyFlowerRegu
+    private static int totalUnlockSpecialFlower;
+
+    public static int TotalUnlockNormalFlower
     {
-        get { return MyFlowerRegu_; }
+        get { return totalUnlockNormalFlower; }
         set
         {
-            MyFlowerRegu_ = value;
+            totalUnlockNormalFlower = value;
 
-            MyFlower = MyFlowerSpec_ + MyFlowerRegu_;
+            TotalUnlockFlower = totalUnlockSpecialFlower + totalUnlockNormalFlower;
         }
     }
-    public static int TotalFlowerSpec
+    private static int totalUnlockNormalFlower;
+
+    public static int TotalFlower;
+
+    public static int TotalSpecialFlower
     {
-        get { return TotalFlowerSpec_; }
+        get { return totalSpecialFlower; }
         set
         {
-            TotalFlowerSpec_ = value;
+            totalSpecialFlower = value;
 
-            TotalFlower = TotalFlowerSpec_ + TotalFlowerRegu_;
+            TotalFlower = totalSpecialFlower + totalNormalFlower;
         }
     }
-    public static int TotalFlowerRegu
+    private static int totalSpecialFlower;
+
+    public static int TotalNormalFlower
     {
-        get { return TotalFlowerRegu_; }
+        get { return totalNormalFlower; }
         set
         {
-            TotalFlowerRegu_ = value;
+            totalNormalFlower = value;
 
-            TotalFlower = TotalFlowerSpec_ + TotalFlowerRegu_;
+            TotalFlower = totalSpecialFlower + totalNormalFlower;
         }
     }
+    private static int totalNormalFlower;
 
-    public static int Slot_;
-    public static int DefaultSlot = 1;
-    private static int MyFlower_;
-    private static int MyFlowerSpec_;
-    private static int MyFlowerRegu_;
-    private static int TotalFlowerSpec_;
-    private static int TotalFlowerRegu_;
 
     public static int FirstUnlockFlowerID
     {
         get
         {
-            foreach (var kv in FlowerInfoDic)
+            foreach (var kv in FlowerInfoDictionary)
             {
                 if (!kv.Value.Unlock)
                 {
@@ -184,7 +191,7 @@ public class GardenManager : Regist
         {
             List<int> unlockedFlowerIDList = new List<int>();
 
-            foreach (var kv in FlowerInfoDic)
+            foreach (var kv in FlowerInfoDictionary)
             {
                 if (kv.Value.Unlock)
                 {
@@ -196,30 +203,45 @@ public class GardenManager : Regist
         }
     }
 
-    public static int TotalFlower;
-    public static bool MiniLock = true;
+    public static int DefaultUnlockSlot = 1;
+    public static bool InMinigameFlag = true;
+
+    public static float MinCreateElfTime = 5;
+    public static float MaxCreateElfTime = 30;
+    public static float CreateElfTimer;
+
+    public static float MinCreateStarTime;
+    public static float MaxCreateStarTime;
+    public static float CreateStarTimer;
 
-    public static float ElfTimer;
-    public static float StarTimer;
-    public static float AwardTimer;
+    public static float MinCreateAwardTime = 5;
+    public static float MaxCreateAwardTime = 15;
+    public static float CreateAwardTimer;
 
-    public static Button RetrieveButton;
-    public static Text RetrieveButtonLab;
-    public static Button PurchaseButton;
-    public static Text PurchaseButtonLab;
+    public static Text BuyFlowerButtonText;
+    public static Text RetrieveFlowerButtonText;
+    public static Button BuyFlowerButton;
+    public static Button RetrieveFlowerButton;
 
-    public static FlowerInfo SeleInfo;
+    public static FlowerInfo SelectFlowerInfo;
+    public static TweenMatFloat FlowerCardMaterialTween;
     public static GardenManager Instance;
 
     public static List<Slot> SlotList = new List<Slot>();
-    public static List<Slot> PlantList = new List<Slot>();
+    public static List<Slot> PlantSlotList = new List<Slot>();
     public static List<Star> StarList = new List<Star>();
     public static List<ElfType> ElfList = new List<ElfType>();
-    public static List<Transform> PageList = new List<Transform>();
+    public static List<Transform> SlotPageList = new List<Transform>();
 
-    public static Dictionary<int, FlowerInfo> FlowerInfoDic = new Dictionary<int, FlowerInfo>();
+    public static Dictionary<int, FlowerInfo> FlowerInfoDictionary = new Dictionary<int, FlowerInfo>();
 
-    public static TweenMatFloat FlowerCardMatTween;
+    public static int DefaultSlotPage = 2;
+    public static int CriticalSlotIndex = 7;
+    public static int TotalSlotInOnePage = 9;
+    public static int LeftTopSlotIndex = 0;
+    public static int RightTopSlotIndex = 3;
+    public static int RightDownSlotIndex = 8;
+    public static int LeftDownSlotIndex = 4;
 
     #endregion
 
@@ -230,78 +252,71 @@ public class GardenManager : Regist
             return;
         }
 
-        ElfThread();
+        CreateElfThread();
 
-        StarThread();
+        CreateStarThread();
 
-        AwardThread();
+        CreateAwardThread();
     }
 
-
-    public static float MinElfTime = 5;
-    public static float MaxElfTime = 30;
-    public void ElfThread()
+    public void CreateElfThread()
     {
-        if (!MiniLock)
+        if (!InMinigameFlag)
         {
             return;
         }
 
-        ElfTimer -= Time.deltaTime;
+        CreateElfTimer -= Time.deltaTime;
 
-        if (ElfTimer < 0)
+        if (CreateElfTimer < 0)
         {
-            ElfTimer = Random.Range(MinElfTime, MaxElfTime);
+            CreateElfTimer = Random.Range(MinCreateElfTime, MaxCreateElfTime);
 
-            if (ElfList.Count > 0 && PlantList.Count > 0)
+            if (ElfList.Count > 0 && PlantSlotList.Count > 0)
             {
-                PlantList.Random()[0].Flower.GetElf(ElfList.Random()[0]);
+                PlantSlotList.Random()[0].PlantFlower.GetElf(ElfList.Random()[0]);
             }
         }
     }
 
-    public static float MinStarTime;
-    public static float MaxStarTime;
-    public void StarThread()
+    public void CreateStarThread()
     {
-        if (MiniLock && !Manager.MiniLock && !VisitManager.InVisit)
+        if (InMinigameFlag && !Manager.MinigameFlag && !VisitManager.InVisit)
         {
-            StarTimer -= Time.deltaTime;
+            CreateStarTimer -= Time.deltaTime;
 
-            if (StarTimer < 0)
+            if (CreateStarTimer < 0)
             {
-                StarTimer = Mathf.Lerp(MinStarTime, MaxStarTime, Random.Range(0f, 1f));
+                CreateStarTimer = Mathf.Lerp(MinCreateStarTime, MaxCreateStarTime, Random.Range(0f, 1f));
 
                 StarList.Add(ResourceManager.GetStar());
             }
         }
     }
 
-    public static float MinAwardTime = 5;
-    public static float MaxAwardTime = 15;
-    public void AwardThread()
+    public void CreateAwardThread()
     {
-        if (MiniLock)
+        if (InMinigameFlag)
         {
-            AwardTimer -= Time.deltaTime;
+            CreateAwardTimer -= Time.deltaTime;
 
-            if (AwardTimer <= 0)
+            if (CreateAwardTimer <= 0)
             {
-                AwardTimer = Random.Range(MinAwardTime, MaxAwardTime);
+                CreateAwardTimer = Random.Range(MinCreateAwardTime, MaxCreateAwardTime);
 
                 List<Flower> spareList = new List<Flower>();
 
-                for (int i = 0; i < PlantList.Count; i++)
+                for (int i = 0; i < PlantSlotList.Count; i++)
                 {
-                    if (PlantList[i].Flower.Award == false)
+                    if (PlantSlotList[i].PlantFlower.HaveAward == false)
                     {
-                        spareList.Add(PlantList[i].Flower);
+                        spareList.Add(PlantSlotList[i].PlantFlower);
                     }
                 }
 
                 if (spareList.Count > 0)
                 {
-                    spareList.Random()[0].Award = true;
+                    spareList.Random()[0].HaveAward = true;
                 }
             }
         }
@@ -312,7 +327,7 @@ public class GardenManager : Regist
     {
         ResourceManager.Get(ResourceLabel.Garden, Folder.Scene, true, transform, true, ObjType.Garden).AddScript<Garden>();
 
-        for (int i = 0; i < DefaultPage; i++)
+        for (int i = 0; i < DefaultSlotPage; i++)
         {
             CreatePage();
         }
@@ -325,16 +340,16 @@ public class GardenManager : Regist
         {
             FlowerInfo flowerInfo = new FlowerInfo(attributeList[i]);
 
-            if (flowerInfo.Special)
+            if (flowerInfo.IsSpecial)
             {
-                TotalFlowerSpec++;
+                TotalSpecialFlower++;
             }
             else
             {
-                TotalFlowerRegu++;
+                TotalNormalFlower++;
             }
 
-            FlowerInfoDic.Add(flowerInfo.ID_, flowerInfo);
+            FlowerInfoDictionary.Add(flowerInfo.ID, flowerInfo);
         }
 
         #endregion
@@ -344,8 +359,8 @@ public class GardenManager : Regist
     {
         Instance = this;
 
-        ElfTimer = Random.Range(MinElfTime, MaxElfTime);
-        AwardTimer = Random.Range(MinAwardTime, MaxAwardTime);
+        CreateElfTimer = Random.Range(MinCreateElfTime, MaxCreateElfTime);
+        CreateAwardTimer = Random.Range(MinCreateAwardTime, MaxCreateAwardTime);
 
         UnlockSlot();
         for (int i = 0; i < ConfigManager.GetIntFormConfig(PlayerConfigLabel.ExtraSlot); i++)
@@ -359,7 +374,7 @@ public class GardenManager : Regist
 
         for (int i = 0; i < flowerIDList.Count; i++)
         {
-            FlowerInfoDic[flowerIDList[i]].Unlock = true;
+            FlowerInfoDictionary[flowerIDList[i]].Unlock = true;
         }
 
 
@@ -367,7 +382,7 @@ public class GardenManager : Regist
 
         for (int i = 0; i < flowerAmountList.Count; i++)
         {
-            FlowerInfoDic[flowerIDList[i]].Amount = flowerAmountList[i];
+            FlowerInfoDictionary[flowerIDList[i]].Amount = flowerAmountList[i];
         }
 
 
@@ -383,64 +398,32 @@ public class GardenManager : Regist
 
     public override void RegistReference()
     {
-        RetrieveButton = ResourceManager.Get<Button>(ObjectLabel.H_Btn);
-        RetrieveButtonLab = ResourceManager.Get<Text>(ObjectLabel.H_BtnLab);
-        PurchaseButton = ResourceManager.Get<Button>(ObjectLabel.H_Btn1);
-        PurchaseButtonLab = ResourceManager.Get<Text>(ObjectLabel.H_BtnLab1);
-    }
-
-
-    public static int DefaultPage = 2;
-    public static int CriticalSlotAmt = 7;
-    public static int TotalSlotAmtInOnePage = 9;
-    public static int LeftTopSlotIndex = 0;
-    public static int RightTopSlotIndex = 3;
-    public static int RightDownSlotIndex = 8;
-    public static int LeftDownSlotIndex = 4;
-    public static void UnlockSlot()
-    {
-        for (int i = 0; i < SlotList.Count; i++)
-        {
-            if (SlotList[i].Lock == false)
-            {
-                Slot++;
-                
-                SlotList[i].Lock = true;
-                SlotList[i].Available = true;
-                
-                if (Slot% TotalSlotAmtInOnePage == CriticalSlotAmt)
-                {
-                    if (Slot/ TotalSlotAmtInOnePage + DefaultPage >= Page)
-                    {
-                        CreatePage();
-                    }
-                }
-
-                return;
-            }
-        }
+        RetrieveFlowerButton = ResourceManager.Get<Button>(ObjectLabel.H_Btn);
+        RetrieveFlowerButtonText = ResourceManager.Get<Text>(ObjectLabel.H_BtnLab);
+        BuyFlowerButton = ResourceManager.Get<Button>(ObjectLabel.H_Btn1);
+        BuyFlowerButtonText = ResourceManager.Get<Text>(ObjectLabel.H_BtnLab1);
     }
 
 
     private static float PageXOffset = 18.9f;
     public static void CreatePage()
     {
-        Transform tra = ResourceManager.Get(ResourceLabel.Page, Folder.Scene, false, ResourceManager.Get(GardenLabel.SlotPage), false, ObjType.Page);
+        Transform tra = ResourceManager.Get(ResourceLabel.Page, Folder.Scene, false, ResourceManager.Get(GardenLabel.SlotPage), false, ObjType.SlotPage);
 
-        float offset = Page*PageXOffset;
+        float offset = TotalSlotPage * PageXOffset;
 
         tra.SetLX(offset);
 
         Vector3 pos = ResourceManager.Get(GardenLabel.SlotPage).position;
 
         pos.x = -offset;
-        
+
         Garden.PagePos.Add(pos);
 
-        for (int i = 0; i < TotalSlotAmtInOnePage; i++)
+        for (int i = 0; i < TotalSlotInOnePage; i++)
         {
             Slot slot = tra.GetChild(i).GetComponent<Slot>();
-            
+
             if (slot == null)
             {
                 slot = tra.GetChild(i).AddScript<Slot>();
@@ -452,69 +435,98 @@ public class GardenManager : Regist
         }
 
 
-        PageList.Add(tra);
+        SlotPageList.Add(tra);
     }
 
-    public static void ShowPlantCard(FlowerInfo flowerInfo, Slot seleSlot = null)
+    public static void UnlockSlot()
     {
-        ShowFlowerCard(flowerInfo, null, seleSlot);
+        for (int i = 0; i < SlotList.Count; i++)
+        {
+            if (SlotList[i].Lock == false)
+            {
+                TotalSlot++;
+                
+                SlotList[i].Lock = true;
+                SlotList[i].Available = true;
+                
+                if (TotalSlot% TotalSlotInOnePage == CriticalSlotIndex)
+                {
+                    if (TotalSlot/ TotalSlotInOnePage + DefaultSlotPage >= TotalSlotPage)
+                    {
+                        CreatePage();
+                    }
+                }
 
-        RetrieveButton.SetActive(false);
-        PurchaseButton.SetActive(true);
+                return;
+            }
+        }
     }
 
-    public static void ShowRetrieveCard(FlowerInfo flowerInfo, Slot seleSlot = null)
+
+    public static void ShowPlantCard(FlowerInfo flowerInfo, Slot seleSlot = null)
     {
         ShowFlowerCard(flowerInfo, null, seleSlot);
 
-        RetrieveButton.SetActive(true);
-        PurchaseButton.SetActive(true);
+        RetrieveFlowerButton.SetActive(false);
+        BuyFlowerButton.SetActive(true);
     }
 
-    public static void ShowUnlockCard(FlowerInfo flowerInfo, Slot seleSlot = null)
+    public static void PlantFlower(int id, int index)
     {
-        ShowFlowerCard(flowerInfo, Lib.GrayMat, seleSlot);
+        Slot slot = SlotList[index];
 
-        RetrieveButton.SetActive(false);
-        PurchaseButton.SetActive(true);
+        FlowerInfo flowerInfo = FlowerInfoDictionary[id];
+
+        slot.Plant(flowerInfo, false);
     }
 
-    private static void ShowFlowerCard(FlowerInfo flowerInfo, Material material, Slot seleSlot)
+    public static void PlantFlower(FlowerInfo flowerInfo)
     {
-        SetRetrieveBtn(RetrieveButton, RetrieveButtonLab, seleSlot);
-        SetPurchaseBtn(flowerInfo, PurchaseButton, PurchaseButtonLab);
-
-        SeleInfo = flowerInfo;
+        Slot slot = null;
 
-        ResourceManager.Get(ObjectLabel.H_FlowerCard).TweenForCG();
-        ResourceManager.SetText(ObjectLabel.H_Lab, flowerInfo.Name);
+        for (int i = 0; i < SlotList.Count; i++)
+        {
+            if (SlotList[i].Available)
+            {
+                slot = SlotList[i];
 
-        SetPlantStatus(flowerInfo);
+                break;
+            }
+        }
 
-        Image image = ResourceManager.Get<Image>(ObjectLabel.H_Icon2);
-        image.material = material;
-        image.sprite = flowerInfo.Icon;
-        image.Resize(true, DeltaSize.FlowerCardSpriteX, DeltaSize.FlowerCardSpriteY);
+        if (slot == null)
+        {
+            Bubble.Show(null, Language.GetStr(LanguageLabel.Common__NoValidSlot));
+        }
+        else
+        {
+            slot.Plant(flowerInfo, true);
+            UpdatePlantCardStatus(flowerInfo);
+            UpdateRetrieveCardStatus(flowerInfo, RetrieveFlowerButton);
+            AudioManager.PlayClip(AudioLabel.PlantFlower);
+        }
     }
 
-    private static void SetRetrieveBtn(Button button, Text buttonLab, Slot seleSlot = null)
+    private static void UpdatePlantCardStatus(FlowerInfo flowerInfo)
     {
-        RetrieveButton = button;
-        buttonLab.text = Language.GetStr(LanguageLabel.UI__H_BtnLab1);
-        button.image.material = null;
-        button.onClick.RemoveAllListeners();
-        button.onClick.AddListener
-        (
-            () =>
-            {
-                AudioManager.PlayClip(AudioLabel.ClickButton);
-
-                RetriveFlower(seleSlot);
-            }
-        );
+        if (flowerInfo.RemainAmount == 0)
+        {
+            ResourceManager.Get<Button>(ObjectLabel.H_Icon2).interactable = false;
+            ResourceManager.SetActive(ObjectLabel.H_AmtLab, false);
+            ResourceManager.SetActive(ObjectLabel.H_Desc, false);
+            ResourceManager.SetActive(ObjectLabel.H_Rotate, false);
+        }
+        else
+        {
+            ResourceManager.SetActive(ObjectLabel.H_Desc, true);
+            ResourceManager.Get<Button>(ObjectLabel.H_Icon2).interactable = true;
+            ResourceManager.SetActive(ObjectLabel.H_AmtLab, true);
+            ResourceManager.SetText(ObjectLabel.H_AmtLab, FlowerInfo.AmountTextPrefix + flowerInfo.RemainAmount);
+            ResourceManager.SetActive(ObjectLabel.H_Rotate, true);
+        }
     }
 
-    private static void SetPurchaseBtn(FlowerInfo flowerInfo, Button button, Text buttonLab)
+    private static void SetBuyFlowerButton(FlowerInfo flowerInfo, Button button, Text buttonLab)
     {
         if (flowerInfo.UnlockCur == Current.Free)
         {
@@ -531,7 +543,7 @@ public class GardenManager : Regist
         }
         else
         {
-            buttonLab.text = Auxiliary.ImageParse(flowerInfo.UnlockCur) + flowerInfo.UnlockAmt;
+            buttonLab.text = Auxiliary.ImageParse(flowerInfo.UnlockCur) + flowerInfo.UnlockCost;
             button.image.material = null;
             button.onClick.RemoveAllListeners();
             button.onClick.AddListener
@@ -541,15 +553,15 @@ public class GardenManager : Regist
                     Manager.Pay
                     (
                         "",
-                        flowerInfo.UnlockAmt,
+                        flowerInfo.UnlockCost,
                         flowerInfo.UnlockCur,
                         () =>
                         {
                             flowerInfo.Add();
-                            SetPlantStatus(flowerInfo);
-                            HttpManager.Save();
+                            UpdatePlantCardStatus(flowerInfo);
+                            HttpManager.UploadConfig();
 
-                            PlayFlowerCardMatTween();
+                            PlayFlowerCardMaterialTween();
 
                             AudioManager.PlayClip(AudioLabel.GetCurrent);
 
@@ -579,34 +591,7 @@ public class GardenManager : Regist
         }
     }
 
-    private static void SetPlantStatus(FlowerInfo flowerInfo)
-    {
-        if (flowerInfo.RemainAmount == 0)
-        {
-            ResourceManager.Get<Button>(ObjectLabel.H_Icon2).interactable = false;
-            ResourceManager.SetActive(ObjectLabel.H_AmtLab, false);
-            ResourceManager.SetActive(ObjectLabel.H_Desc, false);
-            ResourceManager.SetActive(ObjectLabel.H_Rotate, false);
-        }
-        else
-        {
-            ResourceManager.SetActive(ObjectLabel.H_Desc, true);
-            ResourceManager.Get<Button>(ObjectLabel.H_Icon2).interactable = true;
-            ResourceManager.SetActive(ObjectLabel.H_AmtLab, true);
-            ResourceManager.SetText(ObjectLabel.H_AmtLab, FlowerInfo.AmountTextPrefix + flowerInfo.RemainAmount);
-            ResourceManager.SetActive(ObjectLabel.H_Rotate, true);
-        }
-    }
-
-    private static void SetRetrieveStatus(FlowerInfo flowerInfo, Button button)
-    {
-        if (flowerInfo.PlantAmt == 0)
-            button.SetActive(false);
-        else
-            button.SetActive(true);
-    }
-
-    private static void PlayFlowerCardMatTween()
+    private static void PlayFlowerCardMaterialTween()
     {
         if (ResourceManager.Get<Image>(ObjectLabel.H_Icon2).material != Lib.GrayMat)
         {
@@ -625,14 +610,14 @@ public class GardenManager : Regist
             }
         );
 
-        FlowerCardMatTween = materialUnit.CreateTweenMatFloat(1, 0, 1, true, true, Curve.EaseOutQuad, false);
+        FlowerCardMaterialTween = materialUnit.CreateTweenMatFloat(1, 0, 1, true, true, Curve.EaseOutQuad, false);
 
-        FlowerCardMatTween.OnForwardStart = () =>
+        FlowerCardMaterialTween.OnForwardStart = () =>
         {
             materialUnit.Transform.GetComponent<Image>().material = materialUnit.Material;
         };
 
-        FlowerCardMatTween.OnForwardFinish = () =>
+        FlowerCardMaterialTween.OnForwardFinish = () =>
         {
             ResourceManager.Get<Image>(ObjectLabel.H_Icon2).material = null;
         };
@@ -641,16 +626,24 @@ public class GardenManager : Regist
     }
 
 
+    public static void ShowRetrieveCard(FlowerInfo flowerInfo, Slot seleSlot = null)
+    {
+        ShowFlowerCard(flowerInfo, null, seleSlot);
+
+        RetrieveFlowerButton.SetActive(true);
+        BuyFlowerButton.SetActive(true);
+    }
+
     public static void RetriveFlower(Slot seleSlot = null)
     {
-        if (seleSlot != null && seleSlot.Flower == null)
+        if (seleSlot != null && seleSlot.PlantFlower == null)
             seleSlot = null;
 
         if (seleSlot == null)
         {
-            foreach (var slot in PlantList)
+            foreach (var slot in PlantSlotList)
             {
-                if (slot.Flower.FlowerInfo == SeleInfo)
+                if (slot.PlantFlower.FlowerInfo == SelectFlowerInfo)
                 {
                     seleSlot = slot;
                     break;
@@ -659,61 +652,76 @@ public class GardenManager : Regist
         }
 
         seleSlot.Retrieve();
-        SetPlantStatus(seleSlot.FlowerInfo);
-        SetRetrieveStatus(seleSlot.FlowerInfo, RetrieveButton);
+        UpdatePlantCardStatus(seleSlot.PlantFlowerInfo);
+        UpdateRetrieveCardStatus(seleSlot.PlantFlowerInfo, RetrieveFlowerButton);
     }
 
-    public static void RetriveFlowerAll()
+    public static void RetriveAllFlower()
     {
-        for (int i = 0; i < PlantList.Count; i++)
+        for (int i = 0; i < PlantSlotList.Count; i++)
         {
-            PlantList[i--].Retrieve();
+            PlantSlotList[i--].Retrieve();
         }
     }
 
+    private static void UpdateRetrieveCardStatus(FlowerInfo flowerInfo, Button button)
+    {
+        if (flowerInfo.PlantAmt == 0)
+            button.SetActive(false);
+        else
+            button.SetActive(true);
+    }
 
-    public static void PlantFlower(int id, int index)
+    private static void SetRetrieveFlowerButton(Button button, Text buttonLab, Slot seleSlot = null)
     {
-        Slot slot = SlotList[index];
+        RetrieveFlowerButton = button;
+        buttonLab.text = Language.GetStr(LanguageLabel.UI__H_BtnLab1);
+        button.image.material = null;
+        button.onClick.RemoveAllListeners();
+        button.onClick.AddListener
+        (
+            () =>
+            {
+                AudioManager.PlayClip(AudioLabel.ClickButton);
 
-        FlowerInfo flowerInfo = FlowerInfoDic[id];
+                RetriveFlower(seleSlot);
+            }
+        );
+    }
 
-        slot.Plant(flowerInfo, false);
+
+    public static void ShowUnlockCard(FlowerInfo flowerInfo, Slot seleSlot = null)
+    {
+        ShowFlowerCard(flowerInfo, Lib.GrayMat, seleSlot);
+
+        RetrieveFlowerButton.SetActive(false);
+        BuyFlowerButton.SetActive(true);
     }
 
-    public static void PlantFlower(FlowerInfo flowerInfo)
+    private static void ShowFlowerCard(FlowerInfo flowerInfo, Material material, Slot seleSlot)
     {
-        Slot slot = null;
+        SetRetrieveFlowerButton(RetrieveFlowerButton, RetrieveFlowerButtonText, seleSlot);
+        SetBuyFlowerButton(flowerInfo, BuyFlowerButton, BuyFlowerButtonText);
 
-        for (int i = 0; i < SlotList.Count; i++)
-        {
-            if (SlotList[i].Available)
-            {
-                slot = SlotList[i];
+        SelectFlowerInfo = flowerInfo;
 
-                break;
-            }
-        }
+        ResourceManager.Get(ObjectLabel.H_FlowerCard).TweenForCG();
+        ResourceManager.SetText(ObjectLabel.H_Lab, flowerInfo.Name);
 
-        if (slot == null)
-        {
-            Bubble.Show(null, Language.GetStr(LanguageLabel.Common__NoValidSlot));
-        }
-        else
-        {
-            slot.Plant(flowerInfo, true);
-            SetPlantStatus(flowerInfo);
-            SetRetrieveStatus(flowerInfo, RetrieveButton);
-            AudioManager.PlayClip(AudioLabel.PlantFlower);
-        }
+        UpdatePlantCardStatus(flowerInfo);
+
+        Image image = ResourceManager.Get<Image>(ObjectLabel.H_Icon2);
+        image.material = material;
+        image.sprite = flowerInfo.Icon;
+        image.Resize(true, DeltaSize.FlowerCardSpriteX, DeltaSize.FlowerCardSpriteY);
     }
 
 
     public static void RetrieveAllElf()
     {
-        for (int i = 0; i < PlantList.Count; i++)
+        for (int i = 0; i < PlantSlotList.Count; i++)
         {
-            PlantList[i].Flower.RetrieveElf();
+            PlantSlotList[i].PlantFlower.RetrieveElf();
         }
     }
 

Assets/Script/Manage/HttpManager.cs

@@ -18,7 +18,7 @@ using Random = UnityEngine.Random;
 
 public class MailItemLabel
 {
-    public static string Lab = "Lab";
+    public static string Title = "Title";
     public static string Icon1 = "Icon1";
     public static string Icon2 = "Icon2";
     public static string Icon3 = "Icon3";
@@ -48,13 +48,13 @@ public class HttpManager : Regist
 {
     public class MailReward
     {
-        public string Id;
+        public string ID;
         public string Key;
         public string Value;
 
         public MailReward(string id, string key, string value)
         {
-            Id = id;
+            ID = id;
             Key = key;
             Value = value;
         }
@@ -62,11 +62,11 @@ public class HttpManager : Regist
 
     #region Config
 
-    public static bool Connect
+    public static bool IsConnect
     {
         get
         {
-            if (Connect_)
+            if (isConnect)
             {
                 return true;
             }
@@ -75,17 +75,18 @@ public class HttpManager : Regist
                 return TutorialManager.ConnectExempt;
             }
         }
-        set { Connect_ = value; }
+        set { isConnect = value; }
     }
+    public static bool isConnect;
 
-    public static bool PackLock
+    public static bool BuyPackLimitFlag
     {
-        get { return PackLock_; }
+        get { return buyPackLimitFlag; }
         set
         {
-            PackLock_ = value;
+            buyPackLimitFlag = value;
 
-            foreach (var kv in Manager.SkillDic)
+            foreach (var kv in Manager.SkillDictionary)
             {
                 if (kv.Value is Pack)
                 {
@@ -94,34 +95,34 @@ public class HttpManager : Regist
             }
         }
     }
+    public static bool buyPackLimitFlag;
 
-    public static bool Connect_;
-    public static bool PackLock_;
 
-    public static int Counter;
+    public static int MaxReconnectAmt = 4;
+    public static int ReconnectCounter;
+    public static float ReconnectTime = 2f;
+    public static float ReconnectTimeTimer;
+
     public static int PraiseAmt;
 
-    public static bool RankReady;
+    public static bool IsRankDataReady;
     public static List<JsonData> RankDatas;
 
-    public static int NotificationIndex = -1;
-    public static bool NotificationReady;
-    public static string NotificationStr;
-    public static Sprite NotificationSprite;
-
-    public static float Timer;
-    public static bool Complete;
-    public static bool FirstConnect = true;
+    public static int AnnounceIndex = -1;
+    public static bool IsAnnounceReady;
+    public static string AnnounceContent;
+    public static Sprite AnnounceSpite;
 
     public static int ReplayVersion;
+    public static bool Inited;
+    public static bool FirstTimeConnectFlag = true;
     public static string ID = PlayerConfigLabel.DefaultID;
     public static string SerialNumber = PlayerConfigLabel.DefaultSerialNumber;
-    public static string ReportContent;
-
-    public static JsonData JsonData;
-    public static DateTime Time = DateTime.Now;
+    public static string ReportIssueContent;
+    public static JsonData LoginCallbackData;
+    public static DateTime CurrentDateTime = DateTime.Now;
 
-    public static string MailXml;
+    public static string MailXmlStr;
     public static List<MailReward> MailRewardList = new List<MailReward>();
 
     public static string BaseURL = "https://garden.dashgame.com/index.php/home";
@@ -149,29 +150,27 @@ public class HttpManager : Regist
         
     }
 
-    private int MaxReconnectAmt = 4;
-    private float ReconnectTime = 2f;
     public void Update()
     {
-        if (!Manager.Complete && !Complete)
+        if (!Manager.Inited && !Inited)
         {
-            Timer += UnityEngine.Time.deltaTime;
+            ReconnectTimeTimer += Time.deltaTime;
 
-            if (Timer >= ReconnectTime)
+            if (ReconnectTimeTimer >= ReconnectTime)
             {
-                Timer = 0;
-                Counter++;
+                ReconnectTimeTimer = 0;
+                ReconnectCounter++;
 
-                if (Counter > MaxReconnectAmt)
+                if (ReconnectCounter > MaxReconnectAmt)
                 {
-                    Complete = true;
+                    Inited = true;
 
-                    Manager.LoginCallbackInitial(new JsonData());
+                    Manager.FirstTimeLoginCallback(new JsonData());
                 }
                 else
                 {
-                    Login(Manager.LoginCallbackInitial);
-                    IOSAlipayRequest();
+                    Login(Manager.FirstTimeLoginCallback);
+                    GetAlipayFlag();
                 }
             }
         }
@@ -227,7 +226,7 @@ public class HttpManager : Regist
     }
 
 
-    public static void RankRequest()
+    public static void GetRankData()
     {
         URLRequestData urlData = new URLRequestData();
 
@@ -252,12 +251,12 @@ public class HttpManager : Regist
                     jsondata["error"] = 0;
                 }
                 
-                RankRequestCallback(jsondata);
+                GetRankDataCallback(jsondata);
             }
         );
     }
 
-    public static void RankRequestCallback(JsonData jsonData)
+    public static void GetRankDataCallback(JsonData jsonData)
     {
         if (jsonData.Inst_Object.ContainsKey("l"))
         {
@@ -268,16 +267,16 @@ public class HttpManager : Regist
                 RankDatas.Add(jsonData["l"][i]);
             }
 
-            RankReady = true;
+            IsRankDataReady = true;
 
-            SocialManager.InitializeRankPanel();
+            SocialManager.InitRankPanel();
         }
     }
 
 
-    public static void NotificationRequest()
+    public static void GetAnnounceData()
     {
-        IndexRequest
+        GetUrlAddress
         (
             data =>
             {
@@ -289,14 +288,14 @@ public class HttpManager : Regist
                     urlData,
                     notificationXml =>
                     {
-                        NotificationCallback(notificationXml);
+                        GetAnnounceDataCallback(notificationXml);
                     }
                 );
             }
         );
     }
 
-    public static void NotificationCallback(string xml)
+    public static void GetAnnounceDataCallback(string xml)
     {
         XmlNode rootNode;
         XmlDocument document = new XmlDocument();
@@ -307,7 +306,7 @@ public class HttpManager : Regist
 
             rootNode = document.SelectSingleNode("announce");
 
-            NotificationIndex = int.Parse(rootNode.SelectSingleNode(PlayerConfigLabel.Version).InnerText);
+            AnnounceIndex = int.Parse(rootNode.SelectSingleNode(PlayerConfigLabel.Version).InnerText);
 
             XmlNodeList nodeList = rootNode.SelectNodes(ConfigLabel.ChildNode);
 
@@ -315,10 +314,10 @@ public class HttpManager : Regist
 
             for (int i = 0; i < nodeList.Count; i++)
             {
-                DecodeNotificationItem(nodeList[i], urlList);
+                DecodeAnnounceData(nodeList[i], urlList);
             }
 
-            Auxiliary.Instance.StartCoroutine(PullNotifyTexs(urlList, PullNotifyTexsCallback));
+            Auxiliary.Instance.StartCoroutine(PullAnnounceSprite(urlList, PullAnnounceSpriteCallback));
         }
         catch (Exception)
         {
@@ -326,7 +325,7 @@ public class HttpManager : Regist
         }
     }
 
-    public static void DecodeNotificationItem(XmlNode node, List<string> urlList)
+    public static void DecodeAnnounceData(XmlNode node, List<string> urlList)
     {
         XmlNodeList nodeList = node.SelectNodes("title");
 
@@ -356,7 +355,24 @@ public class HttpManager : Regist
         AnnounceManager.AddContent(false, "null", "", TextAnchor.MiddleLeft);
     }
 
-    public static void PullNotifyTexsCallback(List<WWW> wwwList)
+    public static IEnumerator PullAnnounceSprite(List<string> urlList, Action<List<WWW>> callback)
+    {
+        List<WWW> wwwList = new List<WWW>();
+
+        for (int i = 0; i < urlList.Count; i++)
+        {
+            wwwList.Add(new WWW(urlList[i]));
+        }
+        
+        for (int i = 0; i < wwwList.Count; i++)
+        {
+            yield return wwwList[i];
+        }
+
+        callback(wwwList);
+    }
+
+    public static void PullAnnounceSpriteCallback(List<WWW> wwwList)
     {
         List<Texture2D> textureList = new List<Texture2D>();
         List<SpriteInfo> spriteInfoList = new List<SpriteInfo>();
@@ -393,32 +409,15 @@ public class HttpManager : Regist
             SpriteAsset.SpriteInfoDic.Add(spriteInfoList[i].Name, spriteInfoList[i]);
         }
 
-        NotificationSprite = sprite;
-        NotificationReady = true;
+        AnnounceSpite = sprite;
+        IsAnnounceReady = true;
 
-        if (Initializer.Complete)
+        if (Initializer.Inited)
         {
             ResourceManager.Get(ObjectLabel.C_Notify).TweenForCG();
         }
     }
 
-    public static IEnumerator PullNotifyTexs(List<string> urlList, Action<List<WWW>> callback)
-    {
-        List<WWW> wwwList = new List<WWW>();
-
-        for (int i = 0; i < urlList.Count; i++)
-        {
-            wwwList.Add(new WWW(urlList[i]));
-        }
-        
-        for (int i = 0; i < wwwList.Count; i++)
-        {
-            yield return wwwList[i];
-        }
-
-        callback(wwwList);
-    }
-
 
     public static void Praise(string sendID, string receiveID)
     {
@@ -435,7 +434,7 @@ public class HttpManager : Regist
         URLRequest.CreateStrURLRequest(true, PraiseURL, urlData, (data)=> {}, URLRequest.Method.POST);
     }
 
-    public static void Target(string userID, string targetID, Action<JsonData> callback)
+    public static void CheckIsPraised(string userID, string targetID, Action<JsonData> callback)
     {
         URLRequestData urlData = new URLRequestData();
 
@@ -445,6 +444,7 @@ public class HttpManager : Regist
         URLRequest.CreateURLRequest(true, TargetURL, urlData, data => callback(data), URLRequest.Method.POST);
     }
 
+
     public static void AddComment(string sendID, string receiveID, string content, CommentType type)
     {
         if (string.IsNullOrEmpty(sendID) || string.IsNullOrEmpty(receiveID))
@@ -474,7 +474,7 @@ public class HttpManager : Regist
                 if (data == "{\"error\":0}")
                 {
                     Bubble.Show(Language.GetStr(LanguageLabel.UI__Q_CommentDone));
-                    SocialManager.UpdatePage(false);
+                    SocialManager.UpdateCommentPage(false);
                 }
                 else
                 {
@@ -511,7 +511,7 @@ public class HttpManager : Regist
     }
 
 
-    public static void IndexRequest(Action<JsonData> callback)
+    public static void GetUrlAddress(Action<JsonData> callback)
     {
         URLRequestData urlData = new URLRequestData();
 
@@ -528,11 +528,11 @@ public class HttpManager : Regist
                     {
                         if (Application.platform == RuntimePlatform.Android)
                         {
-                            PackLock = true;
+                            BuyPackLimitFlag = true;
                         }
                         else if (Application.platform == RuntimePlatform.IPhonePlayer)
                         {
-                            PackLock = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.PackLock);
+                            BuyPackLimitFlag = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.PackLock);
                         }
                     }
                 }
@@ -544,7 +544,7 @@ public class HttpManager : Regist
         );
     }
 
-    public static void MailRequest()
+    public static void GetMailAwardData()
     {
         //MailXml = "<mail>" +
         //          "<OneTimeReward>" +
@@ -573,7 +573,7 @@ public class HttpManager : Regist
         //          "</OneTimeReward>" +
         //          "</mail>";
 
-        IndexRequest
+        GetUrlAddress
         (
             data =>
             {
@@ -585,14 +585,14 @@ public class HttpManager : Regist
                     urlData,
                     mailXml =>
                     {
-                        MailXml = mailXml;
+                        MailXmlStr = mailXml;
                     }
                 );
             }
         );
     }
 
-    public static void GetMailReward()
+    public static void GetAllMailReward()
     {
         for (int i = 0; i < MailRewardList.Count; i++)
         {
@@ -602,12 +602,12 @@ public class HttpManager : Regist
 
     public static void GetMailReward(MailReward mailReward)
     {
-        ConfigManager.SaveStringToConfig(PlayerConfigLabel.OneTimeReward, $"{ConfigManager.GetStringFormConfig(PlayerConfigLabel.OneTimeReward)} {mailReward.Id}".Trim(' '));
+        ConfigManager.SaveStringToConfig(PlayerConfigLabel.OneTimeReward, $"{ConfigManager.GetStringFormConfig(PlayerConfigLabel.OneTimeReward)} {mailReward.ID}".Trim(' '));
 
         Transform mailItem = ResourceManager.Get(ResourceLabel.MailItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.Bd_Grid), new Vector3(), ObjType.MailItem);
         Dictionary<string, Transform> childDictionary = new Dictionary<string, Transform>();
         Auxiliary.CompileDic(mailItem, childDictionary);
-        Text lab = childDictionary[MailItemLabel.Lab].GetComponent<Text>();
+        Text lab = childDictionary[MailItemLabel.Title].GetComponent<Text>();
         Image Icon1 = childDictionary[MailItemLabel.Icon1].GetComponent<Image>();
         Image Icon2 = childDictionary[MailItemLabel.Icon2].GetComponent<Image>();
         Image Icon3 = childDictionary[MailItemLabel.Icon3].GetComponent<Image>();
@@ -616,7 +616,7 @@ public class HttpManager : Regist
         {
             SkillRoot skillRoot;
 
-            if (Manager.SkillDic.TryGetValue($"{SkillConfigLabel.Pack}{mailReward.Value}", out skillRoot))
+            if (Manager.SkillDictionary.TryGetValue($"{SkillConfigLabel.Pack}{mailReward.Value}", out skillRoot))
             {
                 Pack pack = (Pack) skillRoot;
 
@@ -631,7 +631,7 @@ public class HttpManager : Regist
                 Icon1.transform.localPosition = new Vector2(0, 0);
                 lab.GetComponent<Text>().text = pack.Name;
 
-                InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.PackSprite}{pack.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.PackSprite}{pack.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
             }
             else
             {
@@ -645,21 +645,21 @@ public class HttpManager : Regist
 
             for (int i = 0; i < idList.Count; i++)
             {
-                if (PlayerManager.CloseItemDic.TryGetValue(idList[i], out closeItem))
+                if (PlayerManager.CloseItemDictionary.TryGetValue(idList[i], out closeItem))
                 {
-                    if (closeItem.Possess == false)
+                    if (closeItem.IsBought == false)
                     {
                         closeItem.Unlock();
 
-                        PlayerManager.BoughtCloseList.UniqueAdd(idList[i]);
+                        PlayerManager.BoughtCloseIDs.UniqueAdd(idList[i]);
                     }
 
                     float newSize = 0.6f;
                     float newSpriteSize = closeItem.PixelSize*newSize/closeItem.Sprites[0].rect.width;
-                    closeItem.SetUpUI(newSpriteSize, new Vector2(), Icon1, Icon3, Icon2);
+                    closeItem.SetupUI(newSpriteSize, new Vector2(), Icon1, Icon3, Icon2);
                     lab.text = closeItem.Name;
 
-                    InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CloseSprite}{closeItem.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+                    InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CloseSprite}{closeItem.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
                 }
                 else
                 {
@@ -674,7 +674,7 @@ public class HttpManager : Regist
 
             for (int i = 0; i < idList.Count; i++)
             {
-                if (GardenManager.FlowerInfoDic.TryGetValue(idList[i], out flowerInfo))
+                if (GardenManager.FlowerInfoDictionary.TryGetValue(idList[i], out flowerInfo))
                 {
                     flowerInfo.Add();
 
@@ -687,7 +687,7 @@ public class HttpManager : Regist
                     Icon1.transform.localPosition = new Vector2(0, 0);
                     lab.text = flowerInfo.Name;
 
-                    InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.FlowerSprite}{flowerInfo.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+                    InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.FlowerSprite}{flowerInfo.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
                 }
                 else
                 {
@@ -708,7 +708,7 @@ public class HttpManager : Regist
             Icon1.transform.localPosition = new Vector2(0, 0);
             lab.text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
 
-            InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CoinSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.CoinSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
         }
         else if (mailReward.Key == "diamond")
         {
@@ -722,7 +722,7 @@ public class HttpManager : Regist
             Icon1.transform.localPosition = new Vector2(0, 0);
             lab.text = Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value));
 
-            InfoBoxManager.GardenInfoBox.Show($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.DiamondSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.DiamondSprite}{Auxiliary.ShrinkNumberStr(double.Parse(mailReward.Value))}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
         }
         else
         {
@@ -730,7 +730,7 @@ public class HttpManager : Regist
         }
     }
 
-    public static void DecodeMailXml(string mailXml)
+    public static void DecodeMailXmlStr(string mailXml)
     {
         MailRewardList = new List<MailReward>();
 
@@ -758,7 +758,7 @@ public class HttpManager : Regist
             DateTime startTime = DateTime.Parse(rewardNodeList[i].SelectSingleNode("start").InnerText);
             DateTime endTime = DateTime.Parse(rewardNodeList[i].SelectSingleNode("end").InnerText);
 
-            if (Time < startTime || Time > endTime)
+            if (CurrentDateTime < startTime || CurrentDateTime > endTime)
             {
                 continue;
             }
@@ -782,30 +782,30 @@ public class HttpManager : Regist
         }
     }
 
-    public static void PackTypeRequest()
+    public static void GetBuyPackLimitFlag()
     {
-        IndexRequest
+        GetUrlAddress
         (
             data =>
             {
-                PackLock = Auxiliary.StringToBool(data["l"][0]["val"].ToJson().Trim('"'), true);
+                BuyPackLimitFlag = Auxiliary.StringToBool(data["l"][0]["val"].ToJson().Trim('"'), true);
 
                 if (Application.platform == RuntimePlatform.Android)
                 {
-                    PackLock = true;
+                    BuyPackLimitFlag = true;
                 }
 
                 if (ConfigManager.configDocument != null)
                 {
-                    ConfigManager.SaveBoolToConfig(PlayerConfigLabel.PackLock, PackLock);
+                    ConfigManager.SaveBoolToConfig(PlayerConfigLabel.PackLock, BuyPackLimitFlag);
                 }
             }
         );
     }
 
-    public static void IOSAlipayRequest()
+    public static void GetAlipayFlag()
     {
-        IndexRequest
+        GetUrlAddress
         (
             data =>
             {
@@ -821,7 +821,7 @@ public class HttpManager : Regist
 
         urlData.Add("t", 1);
         urlData.Add("i", id);
-        urlData.Add("u", JsonData.Inst_Object["i"].ToJson().Trim('"'));
+        urlData.Add("u", LoginCallbackData.Inst_Object["i"].ToJson().Trim('"'));
 
         URLRequest.CreateStrURLRequest(true, GetProductIDURL, urlData, callback, URLRequest.Method.POST);
     }
@@ -838,14 +838,14 @@ public class HttpManager : Regist
 
     private static void LoginCallback(JsonData jsonData)
     {
-        Complete = true;
+        Inited = true;
 
         if (jsonData.Inst_Object.ContainsKey("c"))
         {
-            Connect = true;
-            JsonData = jsonData;
+            IsConnect = true;
+            LoginCallbackData = jsonData;
 
-            Time = DateUtil.GetTime(jsonData["time"].ToJson());
+            CurrentDateTime = DateUtil.GetTime(jsonData["time"].ToJson());
 
             PraiseAmt = int.Parse(jsonData["p"].ToJson().Trim('"'));
 
@@ -860,7 +860,7 @@ public class HttpManager : Regist
                 {
                     ID = jsonData["o"].ToString();
 
-                    if (Initializer.Complete)
+                    if (Initializer.Inited)
                     {
                         ResourceManager.SetText(ObjectLabel.L_UserLab, ID);
                     }
@@ -868,27 +868,27 @@ public class HttpManager : Regist
 
                 if (ConfigManager.GetStringFormConfig(PlayerConfigLabel.SerialNumber) == PlayerConfigLabel.DefaultID)
                 {
-                    SerialNumber = JsonData["i"].ToString();
+                    SerialNumber = LoginCallbackData["i"].ToString();
                 }
             }
 
-            if (FirstConnect)
+            if (FirstTimeConnectFlag)
             {
-                FirstConnect = false;
+                FirstTimeConnectFlag = false;
 
                 StaticsManager.GetInstance().ActOrReg(ID, DataEyeGA.AccountType.Official);
             }
         }
         else
         {
-            Connect = false;
+            IsConnect = false;
         }
     }
 
 
-    public static void Save()
+    public static void UploadConfig()
     {
-        Manager.SaveTimer = 0;
+        Manager.UploadConfigTimer = 0;
 
         URLRequestData urlData = new URLRequestData();
 
@@ -903,7 +903,7 @@ public class HttpManager : Regist
     }
 
 
-    public static void Other(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
+    public static void GetTargetConfig(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
     {
         URLRequestData urlData = new URLRequestData();
 
@@ -912,7 +912,7 @@ public class HttpManager : Regist
         URLRequest.CreateURLRequest(true, OtherURL, urlData, callback, URLRequest.Method.POST);
     }
 
-    public static void DownloadByID(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
+    public static void GetConfigByID(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
     {
         URLRequestData urlData = new URLRequestData();
 
@@ -921,7 +921,7 @@ public class HttpManager : Regist
         URLRequest.CreateURLRequest(true, DownloadURL, urlData, callback, URLRequest.Method.POST);
     }
 
-    public static void DownloadBySerialNumber(string serialNumber, URLRequest.URLRequestJsonCallBackDelegate callback)
+    public static void GetConfigBySerialNumber(string serialNumber, URLRequest.URLRequestJsonCallBackDelegate callback)
     {
         URLRequestData urlData = new URLRequestData();
 
@@ -930,7 +930,7 @@ public class HttpManager : Regist
         URLRequest.CreateURLRequest(true, DownloadURL, urlData, callback, URLRequest.Method.POST);
     }
 
-    public static void RandomLoad(URLRequest.URLRequestJsonCallBackDelegate callback)
+    public static void GetRandomConfig(URLRequest.URLRequestJsonCallBackDelegate callback)
     {
         URLRequestData urlData = new URLRequestData();
 
@@ -967,7 +967,7 @@ public class HttpManager : Regist
     private static string SmtpHost = "smtp.163.com";
     private static string ReporterMailAccount = "dashgamegarden@163.com";
     private static string ReporterMailPassword = "cs670cs";
-    public static void Report()
+    public static void ReportIssue()
     {
         ResourceManager.Get(ObjectLabel.Lb_Info).TweenBacCG();
 
@@ -985,7 +985,7 @@ public class HttpManager : Regist
         {
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Lb_Send2));
         }
-        else if(ReportContent == content)
+        else if(ReportIssueContent == content)
         {
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Lb_Send1));
         }
@@ -997,9 +997,9 @@ public class HttpManager : Regist
 
             mailMessage.From = new MailAddress(ReporterMailAccount);
 
-            ReportContent = content;
+            ReportIssueContent = content;
 
-            mailMessage.Body = emailAddress + '\n' + ReportContent + '\n' + GetSystemInfo();
+            mailMessage.Body = emailAddress + '\n' + ReportIssueContent + '\n' + GetSystemInfo();
 
             mailMessage.Subject = ID + " MyLovelyGargen Issue";
 

Assets/Script/Manage/IAPManager.cs

@@ -25,29 +25,30 @@ public class IAPManager : MonoBehaviour, IStoreListener
 {
     #region Config
 
-    public static float Timer;
-
-    public static DateTime? ADPlayTime = null;
-    public static List<Chest> ChestList = new List<Chest>();
+    public static float ReloadADTime = 10f;
+    public static float CreateADChestTime = 1200f;
+    public static float CreateADChestTimer;
+    public static DateTime? LastPlayADsTime;
+    public static List<Chest> ADChests = new List<Chest>();
+    public static UnityAction OnPlayAD;
+
+    public static bool Inited;
+    public static IAPManager Instance;
 
     public static bool UseAlipayOnIOS = false;
-    public static bool Complete;
-    public static IAPManager Instance;
     public static PayChannel PayChannel;
-    public static UnityAction AdAction;
     public static IStoreController IStoreController;
     public static IExtensionProvider IExtensionProvider;
 
     public static List<string> ProductList = new List<string>();
-    public static Dictionary<string, string> PackNameDic = new Dictionary<string, string>();
-    public static Dictionary<string, string> ProductIdDic = new Dictionary<string, string>();
-    public static Dictionary<string, UnityAction> ProductActionDic = new Dictionary<string, UnityAction>();
+    public static Dictionary<string, string> PackNameDictionary = new Dictionary<string, string>();
+    public static Dictionary<string, string> ProductIdDictionary = new Dictionary<string, string>();
+    public static Dictionary<string, UnityAction> BuyProductCallbackDictionary = new Dictionary<string, UnityAction>();
 
     #region Share配置
 
     public static string ImageUrl = "http://or5zgoeui.bkt.clouddn.com/game_icon.png";
     public static string ImagePath;
-
     public static ShareSDK ShareSdk;
 
     #endregion
@@ -58,37 +59,35 @@ public class IAPManager : MonoBehaviour, IStoreListener
     {
         Instance = this;
 
-        InitializeAD();
-        InitializeShare();
+        InitAD();
+        InitShareSDK();
     }
 
-    private float ReloadADsTime = 10f;
-    private float ReloadADChestTime = 1200f;
     public void Update()
     {
-        if (ChestList.Count > 0)
+        if (ADChests.Count > 0)
             return;
 
-        Timer += Time.deltaTime;
+        CreateADChestTimer += Time.deltaTime;
 
-        if (Timer >= ReloadADsTime)
+        if (CreateADChestTimer >= ReloadADTime)
         {
-            Timer = 0;
+            CreateADChestTimer = 0;
 
             if (!Advertisement.IsReady())
             {
-                InitializeAD();
+                InitAD();
             }
             else
             {
-                if (ADPlayTime == null)
+                if (LastPlayADsTime == null)
                     return;
 
-                if (HttpManager.Connect && (HttpManager.Time.Subtract((DateTime)ADPlayTime).TotalSeconds > ReloadADChestTime))
+                if (HttpManager.IsConnect && (HttpManager.CurrentDateTime.Subtract((DateTime)LastPlayADsTime).TotalSeconds > CreateADChestTime))
                 {
-                    if (GardenManager.MiniLock && !VisitManager.InVisit && !TutorialManager.NewplayerTutorial && !SFSManager.PlazaRoomController.InPlazaRoom && !Player.InDressRoom)
+                    if (GardenManager.InMinigameFlag && !VisitManager.InVisit && !TutorialManager.NewplayerTutorial && !SFSManager.PlazaRoomController.InPlazaRoom && !Player.InDressRoom)
                     {
-                        ChestList.Add(ResourceManager.GetADChest());
+                        ADChests.Add(ResourceManager.GetADChest());
                     }
                 }
             }
@@ -97,28 +96,28 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
     public static void RetrieveADChest()
     {
-        if (ChestList.Count > 0)
+        if (ADChests.Count > 0)
         {
-            ResourceManager.Save(ChestList[0].transform.parent);
-            ChestList.RemoveAt(0);
+            ResourceManager.Save(ADChests[0].transform.parent);
+            ADChests.RemoveAt(0);
         }
     }
 
 
-    public static void Initialize()
+    public static void Init()
     {
         GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I1";
 
-        InitializeIAP();
+        InitIAP();
 
         GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I2";
 
-        ADPlayTime = DateTime.Parse(ConfigManager.GetStringFormConfig(PlayerConfigLabel.ADPlayTime));
+        LastPlayADsTime = DateTime.Parse(ConfigManager.GetStringFormConfig(PlayerConfigLabel.ADPlayTime));
 
         GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>().text = "Error Code : I3";
     }
 
-    public static void InitializeAD()
+    public static void InitAD()
     {
         if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
@@ -134,7 +133,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
         }
     }
 
-    public static void InitializeShare()
+    public static void InitShareSDK()
     {
         if (Application.isMobilePlatform || Application.platform == RuntimePlatform.IPhonePlayer)
         {
@@ -146,7 +145,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
         }
     }
 
-    public static void InitializeIAP()
+    public static void InitIAP()
     {
         if (Application.isEditor)
         {
@@ -159,40 +158,40 @@ public class IAPManager : MonoBehaviour, IStoreListener
         {
             if (UseAlipayOnIOS)
             {
-                InitializeAlipay();
+                InitAlipay();
             }
             else
             {
-                InitializeUnityIAP();
+                InitUnityIAP();
             }
         }
         else
         {
             if (PayChannel == PayChannel.AliPay)
             {
-                InitializeAlipay();
+                InitAlipay();
             }
             else if (PayChannel == PayChannel.UnityIAP)
             {
-                InitializeUnityIAP();
+                InitUnityIAP();
             }
         }
     }
 
-    public static void InitializeAlipay()
+    public static void InitAlipay()
     {
         foreach (var attribute in ConfigManager.GetIAPConfig())
         {
             ProductList.Add(attribute[1].Value);
 
-            ProductIdDic.Add(attribute[5].Value, attribute[1].Value);
-            PackNameDic.Add(attribute[1].Value, attribute[5].Value);
+            ProductIdDictionary.Add(attribute[5].Value, attribute[1].Value);
+            PackNameDictionary.Add(attribute[1].Value, attribute[5].Value);
         }
 
         AliplayManager.Instance.Init();
     }
 
-    public static void InitializeUnityIAP()
+    public static void InitUnityIAP()
     {
         ConfigurationBuilder cb = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
 
@@ -202,8 +201,8 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
             ProductList.Add(attribute[1].Value);
 
-            ProductIdDic.Add(attribute[5].Value, attribute[1].Value);
-            PackNameDic.Add(attribute[1].Value, attribute[5].Value);
+            ProductIdDictionary.Add(attribute[5].Value, attribute[1].Value);
+            PackNameDictionary.Add(attribute[1].Value, attribute[5].Value);
         }
 
         UnityPurchasing.Initialize(Instance, cb);
@@ -212,7 +211,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
     public static void PlayAD(UnityAction action)
     {
-        AdAction = () =>
+        OnPlayAD = () =>
         {
             action.Invoke();
 
@@ -221,10 +220,10 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
         if (Advertisement.IsReady())
         {
-            Manager.ReactiveLock = true;
+            Manager.ReactiveFlag = true;
 
             ShowOptions showOptions = new ShowOptions();
-            showOptions.resultCallback = CallbackAD;
+            showOptions.resultCallback = PlayADCallback;
 
             Advertisement.Show(showOptions);
 
@@ -236,16 +235,16 @@ public class IAPManager : MonoBehaviour, IStoreListener
         }
     }
     
-    public static void CallbackAD(ShowResult showResult)
+    public static void PlayADCallback(ShowResult showResult)
     {
         if (showResult == ShowResult.Finished)
         {
-            AdAction.Invoke();
+            OnPlayAD.Invoke();
 
-            Manager.AdAmt++;
+            Manager.PlayADsAmt++;
 
-            ADPlayTime = HttpManager.Time;
-            ConfigManager.SaveStringToConfig(PlayerConfigLabel.ADPlayTime, ADPlayTime.ToString());
+            LastPlayADsTime = HttpManager.CurrentDateTime;
+            ConfigManager.SaveStringToConfig(PlayerConfigLabel.ADPlayTime, LastPlayADsTime.ToString());
         }
         else if (showResult == ShowResult.Skipped)
         {
@@ -258,18 +257,18 @@ public class IAPManager : MonoBehaviour, IStoreListener
     }
 
 
-    public static void Purchase(string str)
+    public static void TryPurchase(string str)
     {
-        if (!Complete)
+        if (!Inited)
         {
             Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseFail));
 
-            InitializeIAP();
+            InitIAP();
 
             return;
         }
 
-        if (!ProductList.Contains(ProductIdDic[str]))
+        if (!ProductList.Contains(ProductIdDictionary[str]))
         {
             Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseUnvalid));
 
@@ -281,19 +280,19 @@ public class IAPManager : MonoBehaviour, IStoreListener
             jData =>
             {
                 ThanksGift.Init(jData);
-                PurchaseCore(str);
+                Purchase(str);
             },
             () => { Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)); }
         );
     }
 
-    private static void PurchaseCore(string str)
+    private static void Purchase(string str)
     {
         if (PayChannel == PayChannel.AliPay)
         {
             HttpManager.GetProductID
             (
-                ProductIdDic[str],
+                ProductIdDictionary[str],
                 data =>
                 {
                     AliplayManager.Instance.Pay(data, str);
@@ -302,21 +301,21 @@ public class IAPManager : MonoBehaviour, IStoreListener
         }
         else if (PayChannel == PayChannel.UnityIAP)
         {
-            IStoreController.InitiatePurchase(ProductIdDic[str]);
+            IStoreController.InitiatePurchase(ProductIdDictionary[str]);
         }
     }
 
 
     public void OnInitialized(IStoreController controller, IExtensionProvider extensions)
     {
-        Complete = true;
+        Inited = true;
         IStoreController = controller;
         IExtensionProvider = extensions;
     }
 
     public void OnInitializeFailed(InitializationFailureReason error)
     {
-        Complete = false;
+        Inited = false;
     }
 
     public void OnPurchaseFailed(Product i, PurchaseFailureReason p)
@@ -328,9 +327,9 @@ public class IAPManager : MonoBehaviour, IStoreListener
     {
         Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseSuccess));
 
-        string packName = PackNameDic[e.purchasedProduct.definition.id];
+        string packName = PackNameDictionary[e.purchasedProduct.definition.id];
 
-        ProductActionDic[packName].Invoke();
+        BuyProductCallbackDictionary[packName].Invoke();
 
         return PurchaseProcessingResult.Complete;
     }

Assets/Script/Manage/InfoBoxManager.cs

@@ -12,17 +12,17 @@ public class InfoBoxManager : Regist
     {
         public class InfoText
         {
-            public float Timer;
+            public float LiveTimer;
             public Text Text;
         }
 
         #region Config
 
-        public int MaxCount;
+        public int MaxTextCount;
         public bool Lock;
-        public bool Reverse;
-        public float DurationTime;
-        public float DurationTimer;
+        public bool ReverseDirection;
+        public float DisplayTime;
+        public float DisplayTimer;
         public string InfoItemName;
         public List<InfoText> TextList = new List<InfoText>();
 
@@ -33,13 +33,13 @@ public class InfoBoxManager : Regist
 
         #endregion
 
-        public InfoBox(int maxCount, float duration, string infoItemName, bool reverse, ObjType objType, Transform grid)
+        public InfoBox(int maxTextCount, float displayTime, string infoItemName, bool reverseDirection, ObjType objType, Transform grid)
         {
             Grid = grid;
-            Reverse = reverse;
+            ReverseDirection = reverseDirection;
             ObjType = objType;
-            DurationTime = duration;
-            MaxCount = maxCount;
+            DisplayTime = displayTime;
+            MaxTextCount = maxTextCount;
             InfoItemName = infoItemName;
             CanvasGroup = Grid.GetComponent<CanvasGroup>();
             VerticalLayoutGroup = Grid.GetComponent<VerticalLayoutGroup>();
@@ -47,9 +47,9 @@ public class InfoBoxManager : Regist
 
         public void Update()
         {
-            DurationTimer -= Time.deltaTime;
+            DisplayTimer -= Time.deltaTime;
 
-            if (DurationTimer <= 0 && Lock)
+            if (DisplayTimer <= 0 && Lock)
             {
                 Lock = false;
 
@@ -62,14 +62,14 @@ public class InfoBoxManager : Regist
             {
                 InfoText infoText = TextList[i];
 
-                if (infoText.Timer == Mathf.Infinity)
+                if (infoText.LiveTimer == Mathf.Infinity)
                 {
                     continue;
                 }
 
-                infoText.Timer -= Time.deltaTime;
+                infoText.LiveTimer -= Time.deltaTime;
 
-                if (infoText.Timer < 0)
+                if (infoText.LiveTimer < 0)
                 {
                     infoText.Text.TweenBacGra();
 
@@ -78,12 +78,12 @@ public class InfoBoxManager : Regist
             }
         }
 
-        public void Show(string str, float time, Color color, Sprite atlas)
+        public void Display(string str, float time, Color color, Sprite atlas)
         {
             if (CanvasGroup != null)
                 CanvasGroup.TweenForCG();
 
-            if (TextList.Count == MaxCount)
+            if (TextList.Count == MaxTextCount)
             {
                 ResourceManager.Save(TextList[0].Text);
 
@@ -95,7 +95,7 @@ public class InfoBoxManager : Regist
             text.ImagePlus.sprite = atlas;
             text.SetParent(Grid);
 
-            if (Reverse)
+            if (ReverseDirection)
             {
                 text.rectTransform.SetAsLastSibling();
             }
@@ -122,7 +122,7 @@ public class InfoBoxManager : Regist
             text.SetAlpha(1);
             text.color = color;
 
-            infoText.Timer = DurationTime;
+            infoText.LiveTimer = DisplayTime;
 
             infoText.Text = text;
 
@@ -130,17 +130,17 @@ public class InfoBoxManager : Regist
 
 
             Lock = true;
-            DurationTimer = time;
+            DisplayTimer = time;
         }
     }
 
     #region Config
 
-    private const int MaxGardenInfoCount = 4;
-    private const int MaxPlazaRoomCount = 300;
+    private const int MaxGardenInfoItemCount = 4;
+    private const int MaxPlazaRoomItemCount = 300;
 
-    public static float GardenInfoBoxDuration = 45f;
-    public static float PlazaRoomInfoBoxDuration = Mathf.Infinity;
+    public static float GardenInfoBoxDisplayTime = 45f;
+    public static float PlazaRoomInfoBoxDisplayTime = Mathf.Infinity;
 
     public static InfoBox GardenInfoBox;
     public static InfoBox PlazaRoomInfoBox;
@@ -149,8 +149,8 @@ public class InfoBoxManager : Regist
 
     public override void FirstInit()
     {
-        GardenInfoBox = new InfoBox(MaxGardenInfoCount, GardenInfoBoxDuration, ResourceLabel.GardenInfoItem, true, ObjType.C_InfoItem,  ResourceManager.Get(ObjectLabel.C_Info));
-        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomCount, PlazaRoomInfoBoxDuration, ResourceLabel.PlazaInfoItem, true, ObjType.X_InfoItem, ResourceManager.Get(ObjectLabel.X_Info));
+        GardenInfoBox = new InfoBox(MaxGardenInfoItemCount, GardenInfoBoxDisplayTime, ResourceLabel.GardenInfoItem, true, ObjType.GardenInfoItem,  ResourceManager.Get(ObjectLabel.C_Info));
+        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomItemCount, PlazaRoomInfoBoxDisplayTime, ResourceLabel.PlazaInfoItem, true, ObjType.PlazaroomInfoItem, ResourceManager.Get(ObjectLabel.X_Info));
     }
 
     public void Update()

Assets/Script/Manage/Initializer.cs

@@ -8,10 +8,11 @@ using System;
 using System.Xml;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq.Expressions;
 
 public class LogoSceneLabel
 {
-    public static string Text = "Text";
+    public static string DebugText = "DebugText";
     public static string ManagerGame = "ManagerGame";
 }
 
@@ -21,12 +22,11 @@ public class Initializer : MonoBehaviour
 
     public bool DebugMode;
     public bool CatchException;
-
     public GameObject DebugModeGo;
 
-    public static bool Complete;
+    public static bool Inited;
+    public static Text DebugText;
     public static Initializer Instance;
-    public static Transform Transform;
     public static List<Regist> RegistList = new List<Regist>();
 
     #endregion
@@ -35,7 +35,7 @@ public class Initializer : MonoBehaviour
     {
         try
         {
-            InitializeDataEye();
+            InitDataEye();
         }
         catch (Exception)
         {
@@ -53,22 +53,21 @@ public class Initializer : MonoBehaviour
             DontDestroyOnLoad(gameObject);
 
             progress = "3";
-            HttpManager.Login(Manager.LoginCallbackInitial);
+            HttpManager.Login(Manager.FirstTimeLoginCallback);
 
             progress = "4";
-            HttpManager.MailRequest();
+            HttpManager.GetMailAwardData();
 
             progress = "5";
-            HttpManager.RankRequest();
+            HttpManager.GetRankData();
 
             progress = "6";
-            HttpManager.IOSAlipayRequest();
+            HttpManager.GetAlipayFlag();
 
             progress = "7";
-            HttpManager.NotificationRequest();
+            HttpManager.GetAnnounceData();
 
             Instance = this;
-            Transform = transform;
 
             progress = "8";
             if (DebugMode)
@@ -156,163 +155,145 @@ public class Initializer : MonoBehaviour
             gameObject.AddScript<RobotManager>();
 
             progress = "32";
-            StartCoroutine(IInitialize());
+            StartCoroutine(WaitToInit());
         }
         catch (Exception e)
         {
-            GameObject.Find(ObjectLabel.Canvas).GetChild(0).SetActive(true);
-            GameObject.Find(ObjectLabel.Canvas).GetChild(1).SetActive(true);
-            GameObject.Find(LogoSceneLabel.Text).GetComponent<Text>().text = progress + "\n" + e;
-
+            Text debugText = GameObject.Find(LogoSceneLabel.DebugText).GetComponent<Text>();
+            debugText.SetAlpha(1);
+            debugText.text = progress + "\n" + e;
             throw new Exception();
         }
     }
 
-    private void InitializeDataEye()
-    {
-        if (Application.platform == RuntimePlatform.IPhonePlayer)
-        {
-            DataEyeGA.Init("C5790DBD2CFE97BD18C7BE9A95482C05", DataEyeGA.PlatformType.IOS, "Official", "IOS");
-        }
-        else if (Application.isMobilePlatform)
-        {
-            DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.ADR, "Official", "Android");
-        }
-        else if (Application.isEditor)
-        {
-            DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.WP, "Official", "Windows");
-        }
-    }
-
 
-    public static void InitializeEntrance()
+    public static void InitEntrance()
     {
         if (Instance.CatchException)
         {
-            DebugManager.TryCatch(Initialize, EnableDebugLab);
+            DebugManager.TryCatch(Init, EnableDebugLab);
         }
         else
         {
-            Initialize();
+            Init();
         }
     }
 
-    public static Text DebugLab;
-    public static void Initialize()
+    public static void Init()
     {
-        DebugLab = GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>();
+        DebugText = GameObject.Find(ObjectLabel.U_DebugLab).GetComponent<Text>();
         
-        DebugLab.text = "Error code : 1";
+        DebugText.text = "Error code : 1";
 
         TutorialManager.NewplayerTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.NewplayerTutorial);
-        DebugLab.text = "Error code : 1-1";
+        DebugText.text = "Error code : 1-1";
 
         TutorialManager.memoryMinigameTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.MemoryMinigameTutorial);
-        DebugLab.text = "Error code : 1-2";
+        DebugText.text = "Error code : 1-2";
 
         TutorialManager.visitTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.VisitTutorial);
-        DebugLab.text = "Error code : 1-3";
+        DebugText.text = "Error code : 1-3";
 
         TutorialManager.dressroomTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.DressroomTutorial);
-        DebugLab.text = "Error code : 1-4";
+        DebugText.text = "Error code : 1-4";
 
         TutorialManager.findMinigameTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.FindMinigameTutorial);
-        DebugLab.text = "Error code : 1-5";
+        DebugText.text = "Error code : 1-5";
 
         TutorialManager.plazaRoomTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.TutorialPlazaRoom);
-        DebugLab.text = "Error code : 1-5-1";
+        DebugText.text = "Error code : 1-5-1";
 
         TutorialManager.NewplayerTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.NewplayerTutorialIndex);
-        DebugLab.text = "Error code : 1-6";
+        DebugText.text = "Error code : 1-6";
 
         TutorialManager.MemoryMinigameTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.MemoryMinigameTutorialIndex);
-        DebugLab.text = "Error code : 1-7";
+        DebugText.text = "Error code : 1-7";
 
         TutorialManager.VisitTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.VisitTutorialIndex);
-        DebugLab.text = "Error code : 1-8";
+        DebugText.text = "Error code : 1-8";
 
         TutorialManager.DressroomTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.DressroomIndex);
-        DebugLab.text = "Error code : 1-9";
+        DebugText.text = "Error code : 1-9";
 
         TutorialManager.FindMinigameTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.FindMinigameTutorialIndex);
-        DebugLab.text = "Error code : 1-10";
+        DebugText.text = "Error code : 1-10";
 
         TutorialManager.PlazaRoomTutorialIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.TutorialIndexPlazaRoom);
-        DebugLab.text = "Error code : 1-10-1";
+        DebugText.text = "Error code : 1-10-1";
 
         Bundle.LoadAtlasSprites();
-        DebugLab.text = "Error code : 1-11";
+        DebugText.text = "Error code : 1-11";
 
         for (int i = 0; i < RegistList.Count; i++)
         {
-            DebugLab.text = "Error code : 1-12-" + i;
+            DebugText.text = "Error code : 1-12-" + i;
             //Debug.Log(i + " " + RegistList[i].GetType());
             RegistList[i].InstantiatePrefabs();
         }
 
-        DebugLab.text = "Error code : 2";
+        DebugText.text = "Error code : 2";
 
         for (int i = 0; i < RegistList.Count; i++)
         {
-            DebugLab.text = "Error code : 2-" + i;
+            DebugText.text = "Error code : 2-" + i;
             RegistList[i].RegistReference();
         }
 
-        DebugLab.text = "Error code : 3";
+        DebugText.text = "Error code : 3";
 
         for (int i = 0; i < RegistList.Count; i++)
         {
-            DebugLab.text = "Error code : 3-" + i;
+            DebugText.text = "Error code : 3-" + i;
             RegistList[i].FirstInit();
         }
 
-        DebugLab.text = "Error code : 4";
+        DebugText.text = "Error code : 4";
 
         for (int i = 0; i < RegistList.Count; i++)
         {
-            DebugLab.text = "Error code : 4-" + i;
+            DebugText.text = "Error code : 4-" + i;
             RegistList[i].SecondInit();
         }
 
-        DebugLab.text = "Error code : 5";
+        DebugText.text = "Error code : 5";
 
         for (int i = 0; i < RegistList.Count; i++)
         {
-            DebugLab.text = "Error code : 5-" + i;
+            DebugText.text = "Error code : 5-" + i;
             RegistList[i].ThirdInit();
 
             RegistList[i].enabled = true;
         }
 
-        DebugLab.text = "Error code : 6";
+        DebugText.text = "Error code : 6";
 
-        Complete = true;
+        Inited = true;
 
-        if (HttpManager.NotificationReady)
+        if (HttpManager.IsAnnounceReady)
         {
             ResourceManager.Get(ObjectLabel.C_Notify).TweenForCG();
         }
 
-        DebugLab.text = "Error code : 7";
-        PlayerManager.InitializeDressRoom();
+        DebugText.text = "Error code : 7";
+        PlayerManager.InitDressRoom();
 
-        DebugLab.text = "Error code : 8";
-        Manager.LoginCallbackInitial(new JsonData());
+        DebugText.text = "Error code : 8";
+        Manager.FirstTimeLoginCallback(new JsonData());
 
         //debugLab.text = "Error code : 9";
         //SFSManager.GardenSmartFox.Connector.Connect();
 
-        DebugLab.text = "Error code : 10";
+        DebugText.text = "Error code : 10";
         StringFilter.Init();
 
-        DebugLab.text = "Error code : 11";
-        IAPManager.Initialize();
+        DebugText.text = "Error code : 11";
+        IAPManager.Init();
 
-        DebugLab.text = "Error code : 12";
-        VisitManager.Initialize();
+        DebugText.text = "Error code : 12";
+        VisitManager.Init();
 
-        DebugLab.text = "Error code : 13";
-        SocialManager.InitializeRankPanel();
+        DebugText.text = "Error code : 13";
+        SocialManager.InitRankPanel();
 
         if (Instance.DebugMode)
         {
@@ -324,6 +305,43 @@ public class Initializer : MonoBehaviour
         }
     }
 
+    private void InitDataEye()
+    {
+        if (Application.platform == RuntimePlatform.IPhonePlayer)
+        {
+            DataEyeGA.Init("C5790DBD2CFE97BD18C7BE9A95482C05", DataEyeGA.PlatformType.IOS, "Official", "IOS");
+        }
+        else if (Application.isMobilePlatform)
+        {
+            DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.ADR, "Official", "Android");
+        }
+        else if (Application.isEditor)
+        {
+            DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.WP, "Official", "Windows");
+        }
+    }
+
+    public IEnumerator WaitToInit()
+    {
+        while (!Logo.Complete)
+        {
+            yield return null;
+        }
+
+        while (!Bundle.Complete)
+        {
+            yield return null;
+        }
+
+        while (ConfigManager.PlayerDocumentDamageFlag)
+        {
+            yield return null;
+        }
+
+        InitEntrance();
+    }
+
+
     private static float LoadingDelayTime = 3f;
     private static void ShowLoadingPanel()
     {
@@ -345,27 +363,5 @@ public class Initializer : MonoBehaviour
     {
         ResourceManager.Get<CanvasGroup>(ObjectLabel.U_Group).alpha = 0;
         ResourceManager.Get<Text>(ObjectLabel.U_DebugLab).enabled = true;
-        throw new Exception();
-    }
-
-
-    public IEnumerator IInitialize()
-    {
-        while (!Logo.Complete)
-        {
-            yield return null;
-        }
-
-        while (!Bundle.Complete)
-        {
-            yield return null;
-        }
-
-        while (ConfigManager.PlayerDocumentDamageFlag)
-        {
-            yield return null;
-        }
-
-        InitializeEntrance();
     }
 }

Assets/Script/Manage/LanguageManager.cs

@@ -39,23 +39,23 @@ public class LanguageManager : Regist
 
     public static CurrentLanguage CurrentLanguage;
 
-    public static Dictionary<Text, object[]> TextDic = new Dictionary<Text, object[]>();
-    public static Dictionary<TextMesh, object[]> TextMeshDic = new Dictionary<TextMesh, object[]>();
+    public static Dictionary<Text, object[]> TextDictionary = new Dictionary<Text, object[]>();
+    public static Dictionary<TextMesh, object[]> TextMeshDictionary = new Dictionary<TextMesh, object[]>();
 
     #endregion
 
 
     public static void Add(Text text, params object[] objs)
     {
-        if (TextDic.ContainsKey(text))
+        if (TextDictionary.ContainsKey(text))
         {
-            TextDic[text] = objs;
+            TextDictionary[text] = objs;
 
             text.text = Translate(objs);
         }
         else
         {
-            TextDic.Add(text, objs);
+            TextDictionary.Add(text, objs);
 
             text.text = Translate(objs);
         }
@@ -63,15 +63,15 @@ public class LanguageManager : Regist
 
     public static void Add(TextMesh textMesh, params object[] objs)
     {
-        if (TextMeshDic.ContainsKey(textMesh))
+        if (TextMeshDictionary.ContainsKey(textMesh))
         {
-            TextMeshDic[textMesh] = objs;
+            TextMeshDictionary[textMesh] = objs;
 
             textMesh.text = Translate(objs);
         }
         else
         {
-            TextMeshDic.Add(textMesh, objs);
+            TextMeshDictionary.Add(textMesh, objs);
 
             textMesh.text = Translate(objs);
         }
@@ -86,12 +86,12 @@ public class LanguageManager : Regist
 
         Manager.SwitchLanguage();
 
-        foreach (var kv in TextDic)
+        foreach (var kv in TextDictionary)
         {
             kv.Key.text = Translate(kv.Value);
         }
 
-        foreach (var kv in TextMeshDic)
+        foreach (var kv in TextMeshDictionary)
         {
             kv.Key.text = Translate(kv.Value);
         }

Assets/Script/Manage/NickNameManager.cs

@@ -11,24 +11,25 @@ public class NickNameManager : Regist
 {
     #region Config
 
-    public static Action OnSetNickNameSucceed;
-
+    private static int MaxNicknameLength = 12;
 	public static string NickName;
-	public static InputField inputField;
+	public static InputField NicknameInputField;
+
+    public static Action OnSetNickNameSucceed;
 
-    private static List<string> LastNames = new List<string>();
-    private static List<string> FirstNames = new List<string>();
+    private static List<string> DefaultLastNames = new List<string>();
+    private static List<string> DefaultFirstNames = new List<string>();
 
     #endregion
 
     public override void FirstInit()
 	{
 		SetNickName (ConfigManager.GetStringFormConfig (PlayerConfigLabel.NickName));
-		inputField = ResourceManager.Get<InputField> (ObjectLabel.T_InputField);
+		NicknameInputField = ResourceManager.Get<InputField> (ObjectLabel.T_InputField);
 	    string defaultNames = ResourceManager.Load<TextAsset>(ResourceLabel.DefaultNickName, Folder.Config).text;
 	    string[] names = defaultNames.Split('\n');
-        FirstNames = names[0].Split('|')[1].Split(',').ToList();
-	    LastNames = names[1].Split('|')[1].Split(',').ToList();
+        DefaultFirstNames = names[0].Split('|')[1].Split(',').ToList();
+	    DefaultLastNames = names[1].Split('|')[1].Split(',').ToList();
         //Debug.Log(FirstNames.Count);
         //Debug.Log(LastNames.Count);
         //foreach (var VARIABLE in FirstNames)
@@ -41,11 +42,6 @@ public class NickNameManager : Regist
         //}
     }
 
-    public static void SetRandomName()
-    {
-        inputField.text = FirstNames.Random()[0].Trim('\'') + LastNames.Random()[0].Trim('\'');
-    }
-
 
 	public static bool ShowNickNameSettingPanelFirstTime()
 	{
@@ -66,7 +62,7 @@ public class NickNameManager : Regist
 	    else
 	    {
             ResourceManager.SetActive(ObjectLabel.T_Close, true);
-	        inputField.text = NickName;
+	        NicknameInputField.text = NickName;
 	    }
 
 	    ResourceManager.SetText(ObjectLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Tit));
@@ -85,9 +81,23 @@ public class NickNameManager : Regist
 		ResourceManager.Get (ObjectLabel.T_NickNameBK).TweenBacCG ();
 	}
 
-	public static void ResetNickName()
+
+    public static void SetNickName(string nickName)
+    {
+        NickName = nickName;
+        ConfigManager.SaveStringToConfig(PlayerConfigLabel.NickName, nickName);
+
+        ResourceManager.SetText(ObjectLabel.C_NickNameLab, nickName);
+    }
+
+    public static void SetRandomName()
+    {
+        NicknameInputField.text = DefaultFirstNames.Random()[0].Trim('\'') + DefaultLastNames.Random()[0].Trim('\'');
+    }
+
+    public static void ResetNickName()
 	{
-	    if (inputField.text == NickName)
+	    if (NicknameInputField.text == NickName)
 	    {
 	        ResetSucceed();
             return;
@@ -96,11 +106,11 @@ public class NickNameManager : Regist
 	    ResourceManager.SetText(ObjectLabel.T_Tit, Language.GetStr(LanguageLabel.UI__T_Checking));
 	    ResourceManager.Get<CanvasGroup>(ObjectLabel.T_NickNameBK).interactable = false;
 
-		if (InputFieldValidate ())
+		if (ChectInputFieldValue ())
         {
             HttpManager.SetNickName
                 (
-                    inputField.text,
+                    NicknameInputField.text,
                     ResetSucceed,
                     ResetFailed
                 );
@@ -125,7 +135,7 @@ public class NickNameManager : Regist
     {
 	    ResourceManager.Get<CanvasGroup>(ObjectLabel.T_NickNameBK).interactable = true;
 
-        SetNickName(inputField.text);
+        SetNickName(NicknameInputField.text);
 
         AudioManager.PlayClip(AudioLabel.Close);
         CloseNickNameSettingPanel();
@@ -133,27 +143,19 @@ public class NickNameManager : Regist
         OnSetNickNameSucceed.SafeInvoke();
     }
 
-    public static void SetNickName(string nickName)
-	{
-		NickName = nickName;
-		ConfigManager.SaveStringToConfig (PlayerConfigLabel.NickName, nickName);
-
-		ResourceManager.SetText (ObjectLabel.C_NickNameLab, nickName);
-	}
-
-    public static bool InputFieldValidate()
+    public static bool ChectInputFieldValue()
     {
-        inputField.text = inputField.text.Trim();
+        NicknameInputField.text = NicknameInputField.text.Trim();
 
         int charCnt = 0;
 
-        for (int i = 0; i < inputField.text.Length; i++)
+        for (int i = 0; i < NicknameInputField.text.Length; i++)
         {
-            if (inputField.text[i] <= 127)//英文字符
+            if (NicknameInputField.text[i] <= 127)//英文字符
             {
                 charCnt++;
             }
-            else if (inputField.text[i] > 127)//中文字符
+            else if (NicknameInputField.text[i] > 127)//中文字符
             {
                 charCnt += 2;
             }
@@ -164,15 +166,15 @@ public class NickNameManager : Regist
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__T_AllWhiteSpace));
             return false;
         }
-        else if (charCnt > 12)
+        else if (charCnt > MaxNicknameLength)
         {
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__T_TooLong));
-            inputField.text = inputField.text.Substring(0, 12);
+            NicknameInputField.text = NicknameInputField.text.Substring(0, 12);
             return false;
         }
         else
         {
-            if (StringFilter.ContainSensitiveWord(inputField.text))
+            if (StringFilter.ContainSensitiveWord(NicknameInputField.text))
             {
                 Bubble.Show(null, Language.GetStr(LanguageLabel.Common__ContainSensitiveWord));
                 return false;

Assets/Script/Manage/PlayerManager.cs

@@ -22,21 +22,20 @@ public class PlayerManager : Regist
 {
     #region Config
 
-    public static bool Complete;
-    public static Transform SeleTra;
-
+    public static bool Inited;
     public static Player Player;
     public static Transform DressRoom;
-    public static Transform PlayerPink;
-    public static Transform PlayerBlond;
-    public static Transform PlayerBrown;
+    public static Transform DefaultPinkPlayer;
+    public static Transform DefaultBlondPlayer;
+    public static Transform DefaultBrownPlayer;
+    public static Transform SelectedPlayer;
     public static PlayerManager Instance;
 
-    public static List<int>BoughtCloseList = new List<int>();
-    public static List<string> DressData = new List<string>();  
-    public static Dictionary<int, CloseItem> CloseItemDic = new Dictionary<int, CloseItem>();
-    public static Dictionary<string, int> CloseIDDic = new Dictionary<string, int>();
-    public static Dictionary<string, Sprite> CloseSpriteDic = new Dictionary<string, Sprite>();
+    public static List<int>BoughtCloseIDs = new List<int>();
+    public static List<string> DressDatas = new List<string>();  
+    public static Dictionary<int, CloseItem> CloseItemDictionary = new Dictionary<int, CloseItem>();
+    public static Dictionary<string, int> CloseIDDictionary = new Dictionary<string, int>();
+    public static Dictionary<string, Sprite> CloseSpriteDictionary = new Dictionary<string, Sprite>();
 
     #endregion
 
@@ -44,76 +43,76 @@ public class PlayerManager : Regist
     {
         #region Player
 
-        Initializer.DebugLab.text = "error : mp0";
-        if (!Complete)
+        Initializer.DebugText.text = "error : mp0";
+        if (!Inited)
         {
-            Initializer.DebugLab.text = "error : mp0-1";
+            Initializer.DebugText.text = "error : mp0-1";
             UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>(ResourceLabel.StandSke, Folder.Config));
 
-            Initializer.DebugLab.text = "error : mp0-2";
+            Initializer.DebugText.text = "error : mp0-2";
             UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.StandTex, Folder.Config), ResourceLabel.StandTexture);
 
-            Complete = true;
+            Inited = true;
         }
 
-        Initializer.DebugLab.text = "error : mp1";
+        Initializer.DebugText.text = "error : mp1";
         if (!TutorialManager.NewplayerTutorial || TutorialManager.NewplayerTutorialIndex != 1)
         {
             GetPlayer();
 
-            DressData = ConfigManager.GetDressData();
+            DressDatas = ConfigManager.GetDressData();
         }
         else
         {
-            PlayerPink = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, ResourceManager.Get(TutorialLabel.PinkPlayerPos), false, ObjType.Player);
-            PlayerBlond = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, ResourceManager.Get(TutorialLabel.BlondPlayerPos), false, ObjType.Player);
-            PlayerBrown = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, ResourceManager.Get(TutorialLabel.BrownPlayerPos), false, ObjType.Player);
+            DefaultPinkPlayer = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, ResourceManager.Get(TutorialLabel.PinkPlayerPos), false, ObjType.Player);
+            DefaultBlondPlayer = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, ResourceManager.Get(TutorialLabel.BlondPlayerPos), false, ObjType.Player);
+            DefaultBrownPlayer = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, ResourceManager.Get(TutorialLabel.BrownPlayerPos), false, ObjType.Player);
             
-            if (PlayerPink.GetComponent<Player>() == null)
+            if (DefaultPinkPlayer.GetComponent<Player>() == null)
             {
-                PlayerPink.AddScript<Player>().BuildPink();
+                DefaultPinkPlayer.AddScript<Player>().BuildPink();
             }
 
-            if (PlayerBlond.GetComponent<Player>() == null)
+            if (DefaultBlondPlayer.GetComponent<Player>() == null)
             {
-                PlayerBlond.AddScript<Player>().BuildBlond();
+                DefaultBlondPlayer.AddScript<Player>().BuildBlond();
             }
 
-            if (PlayerBrown.GetComponent<Player>() == null)
+            if (DefaultBrownPlayer.GetComponent<Player>() == null)
             {
-                PlayerBrown.AddScript<Player>().BuildBrown();
+                DefaultBrownPlayer.AddScript<Player>().BuildBrown();
             }
 
             Vector3 tutorialPlayerScale = new Vector3(0.8f, 0.8f, 0.8f);
-            PlayerPink.localScale = tutorialPlayerScale;
-            PlayerBlond.localScale = tutorialPlayerScale;
-            PlayerBrown.localScale = tutorialPlayerScale;
+            DefaultPinkPlayer.localScale = tutorialPlayerScale;
+            DefaultBlondPlayer.localScale = tutorialPlayerScale;
+            DefaultBrownPlayer.localScale = tutorialPlayerScale;
 
-            SeleTra = PlayerBlond;
+            SelectedPlayer = DefaultBlondPlayer;
         }
 
         #endregion
 
         #region DressRoom
 
-        Initializer.DebugLab.text = "error : mp2";
+        Initializer.DebugText.text = "error : mp2";
         List<XmlAttributeCollection> attributeList = ConfigManager.GetDressRoomConfig();
 
-        Player.JumpFrequency = float.Parse(attributeList[0][1].Value);
+        Player.InDressRoomJumpFrequency = float.Parse(attributeList[0][1].Value);
 
 
-        Initializer.DebugLab.text = "error : mp3";
+        Initializer.DebugText.text = "error : mp3";
         DressRoom = ResourceManager.Get(ResourceLabel.DressRoom, Folder.Scene, true, null, true, ObjType.DressRoom);
         DressRoom.SetActive(false);
         DontDestroyOnLoad(DressRoom);
 
-        Initializer.DebugLab.text = "error : mp4";
+        Initializer.DebugText.text = "error : mp4";
         List<int> dressList = ConfigManager.GetDressList();
 
-        Initializer.DebugLab.text = "error : mp5";
+        Initializer.DebugText.text = "error : mp5";
         for (int i = 0; i < dressList.Count; i++)
         {
-            BoughtCloseList.Add(dressList[i]);
+            BoughtCloseIDs.Add(dressList[i]);
         }
 
         #endregion
@@ -126,24 +125,6 @@ public class PlayerManager : Regist
         ResourceManager.Get(ResourceLabel.DressRoom).CreateTweenSr(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
     }
 
-
-    public static void InitializeDressRoom()
-    {
-        List<XmlAttributeCollection> attributeList = ConfigManager.GetDressRoomConfig();
-
-        for (int i = 1; i < attributeList.Count; i++)
-        {
-            new CloseItem(attributeList[i]);
-        }
-
-        for (int i = 0; i < BoughtCloseList.Count; i++)
-        {
-            //Debug.Log(BoughtCloseList[i]);
-            CloseItemDic[BoughtCloseList[i]].Unlock();
-        }
-    }
-
-
     public Player GetPlayer(XmlNode xmlNode = null)
     {
         List<string> DressData = new List<string>();
@@ -159,7 +140,7 @@ public class PlayerManager : Regist
 
 
         Transform tra = ResourceManager.Get(ResourceLabel.Player, Folder.Scene, false, transform, false, ObjType.Player);
-        tra.SetParent(ResourceManager.Get(GardenLabel.GardenNormal));
+        tra.SetParent(ResourceManager.Get(GardenLabel.GardenPivot));
 
         Player = tra.GetComponent<Player>();
 
@@ -176,11 +157,11 @@ public class PlayerManager : Regist
 
         Player.SetAllCollider(true);
         Player.Flip(PlayerDirection.Left);
-        Player.transform.position = ResourceManager.Get(GardenLabel.PlayerPosTra).position;
+        Player.transform.position = ResourceManager.Get(GardenLabel.GardenPlayerPos).position;
 
         tra.localScale = new Vector3(0.5f, 0.5f, 0.5f);
 
-        ResourceManager.TraDic.Add(tra.name, tra);
+        ResourceManager.TransformDictionary.Add(tra.name, tra);
 
         return Player;
     }
@@ -206,4 +187,21 @@ public class PlayerManager : Regist
         player.ChangeClose(BodyPart.RightLongSleeve, dressData[10]);
         player.ChangeClose(BodyPart.RightShortSleeve, dressData[11]);
     }
+
+
+    public static void InitDressRoom()
+    {
+        List<XmlAttributeCollection> attributeList = ConfigManager.GetDressRoomConfig();
+
+        for (int i = 1; i < attributeList.Count; i++)
+        {
+            new CloseItem(attributeList[i]);
+        }
+
+        for (int i = 0; i < BoughtCloseIDs.Count; i++)
+        {
+            //Debug.Log(BoughtCloseList[i]);
+            CloseItemDictionary[BoughtCloseIDs[i]].Unlock();
+        }
+    }
 }

Assets/Script/Manage/PlazaRoomManager.cs

@@ -26,37 +26,41 @@ public class PlazaRoomManager : Regist
     }
     private static float itemHeight;
 
-    public static float DownLoadTimespan = 30;
-    public static bool DownloadLock;
-
-    public static int LastIndex;
-    public static int FirstIndex;
-    public static int CustomLastIndex;
-    public static int CustomFirstIndex;
-    public static bool FilterEnabled;
+    private float RefreshRoomStatusTime = 10;
+    private float RefreshRoomStatusTimer = 0;
+
+    public static float DownLoadDataTime = 30;
+    public static bool DownloadDataFlag;
+
+    public static int NormalLastDisplayIndex;
+    public static int NormalFirstDisplayIndex;
+    public static int CustomLastDisplayIndex;
+    public static int CustomFirstDisplayIndex;
+    public static bool FilterFlag;
+
+    public static int ScrollRectMaxDisplayAmt = 10;
+    public static int ScrollRectPageVolume = 5;
     public static Transform Grid;
     public static VirtualScrollRect ScrollRect;
 
-    public static List<PlazaRoomItem> PlazaRoomItems = new List<PlazaRoomItem>();
-    public static Dictionary<int, RoomData> RoomDatas = new Dictionary<int, RoomData>();
+    public static List<PlazaRoomItem> NormalPlazaRoomItems = new List<PlazaRoomItem>();
+    public static Dictionary<int, RoomData> NormalRoomDatas = new Dictionary<int, RoomData>();
 
     public static List<PlazaRoomItem> CustomPlazaRoomItems = new List<PlazaRoomItem>();
     public static Dictionary<int, RoomData> CustomRoomDatas = new Dictionary<int, RoomData>();
 
     #endregion
 
-    private float RefreshTime = 10;
-    private float RefreshTimer = 0;
     private void Update()
     {
-        RefreshTimer += Time.deltaTime;
-        if (RefreshTimer >= RefreshTime)
+        RefreshRoomStatusTimer += Time.deltaTime;
+        if (RefreshRoomStatusTimer >= RefreshRoomStatusTime)
         {
-            RefreshTimer = 0;
-            if (FilterEnabled)
+            RefreshRoomStatusTimer = 0;
+            if (FilterFlag)
                 RefreshRoomStatus(CustomPlazaRoomItems);
             else
-                RefreshRoomStatus(PlazaRoomItems);
+                RefreshRoomStatus(NormalPlazaRoomItems);
         }
     }
 
@@ -64,26 +68,26 @@ public class PlazaRoomManager : Regist
     public override void ThirdInit()
     {
         VirtualScrollRect virtualScrollRect = ResourceManager.Get<VirtualScrollRect>(ObjectLabel.Z_ScrollRect);
-        virtualScrollRect.OnVerticalLessEqual0 = NextPageGate;
-        virtualScrollRect.OnVerticalGreaterEqual1 = PreviousPageGate;
+        virtualScrollRect.OnVerticalLessEqual0 = NextRoomPage;
+        virtualScrollRect.OnVerticalGreaterEqual1 = PreviousRoomPage;
 
-        CostFml = ConfigManager.GetPlazaRoomConfig()[1].Value;
-        ValueFml = ConfigManager.GetPlazaRoomConfig()[2].Value;
+        CreateRoom_CostFml = ConfigManager.GetPlazaRoomConfig()[1].Value;
+        DefaultRoomValueFml = ConfigManager.GetPlazaRoomConfig()[2].Value;
     }
 
     public override void RegistReference()
     {
         Grid = ResourceManager.Get(ObjectLabel.Z_Grid);
         ScrollRect = ResourceManager.Get<VirtualScrollRect>(ObjectLabel.Z_ScrollRect);
-        DurationLab = ResourceManager.Get<Text>(ObjectLabel.AAa_ValueLab);
-        DurationSlider = ResourceManager.Get<Slider>(ObjectLabel.AAa_Slider);
-        MaxPlayerLab = ResourceManager.Get<Text>(ObjectLabel.AAb_ValueLab);
-        MaxPlayerSlider = ResourceManager.Get<Slider>(ObjectLabel.AAb_Slider);
+        CreateRoom_DurationText = ResourceManager.Get<Text>(ObjectLabel.AAa_ValueLab);
+        CreateRoom_DurationSlider = ResourceManager.Get<Slider>(ObjectLabel.AAa_Slider);
+        CreateRoom_MaxPlayerText = ResourceManager.Get<Text>(ObjectLabel.AAb_ValueLab);
+        CreateRoom_MaxPlayerSlider = ResourceManager.Get<Slider>(ObjectLabel.AAb_Slider);
         
-        DurationSlider.onValueChanged.AddListener(OnSliderValueChange);
-        DurationSlider.onValueChanged.AddListener(f => AudioManager.PlayClip(AudioLabel.ClickButton));
-        MaxPlayerSlider.onValueChanged.AddListener(OnSliderValueChange);
-        MaxPlayerSlider.onValueChanged.AddListener(f => AudioManager.PlayClip(AudioLabel.ClickButton));
+        CreateRoom_DurationSlider.onValueChanged.AddListener(OnSliderValueChange);
+        CreateRoom_DurationSlider.onValueChanged.AddListener(f => AudioManager.PlayClip(AudioLabel.ClickButton));
+        CreateRoom_MaxPlayerSlider.onValueChanged.AddListener(OnSliderValueChange);
+        CreateRoom_MaxPlayerSlider.onValueChanged.AddListener(f => AudioManager.PlayClip(AudioLabel.ClickButton));
     }
 
 
@@ -97,16 +101,16 @@ public class PlazaRoomManager : Regist
         SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetRoomFullStatus(databaseRoomIDs);
     }
 
-    public static void DownloadRoomData()
+    public static void DownloadNormalRoomData()
     {
         LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__Loading));
         ResourceManager.Get(ObjectLabel.Z_Tip).TweenForCG();
-        DownloadLock = true;
+        DownloadDataFlag = true;
         SFSManager.GardenSmartFox.ExecuteAfterCheckConection
         (
-            () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetRoomData(LastIndex),
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } },
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } }
+            () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetRoomData(NormalLastDisplayIndex),
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } },
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } }
          );
     }
 
@@ -114,30 +118,30 @@ public class PlazaRoomManager : Regist
     {
         LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__Loading));
         ResourceManager.Get(ObjectLabel.Z_Tip).TweenForCG();
-        DownloadLock = true;
+        DownloadDataFlag = true;
         SFSManager.GardenSmartFox.ExecuteAfterCheckConection
         (
-            () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetCustomRoomData(CustomLastIndex, long.Parse(HttpManager.SerialNumber)),
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } },
-            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } }
+            () => SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.GetCustomRoomData(CustomLastDisplayIndex, long.Parse(HttpManager.SerialNumber)),
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } },
+            (succeed, baseEvent) => { if (!succeed) { LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Z_Tip), new MulLanStr(LanguageLabel.UI__LoadFailed)); DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; ResourceManager.Get(ObjectLabel.Z_Tip).TweenBacCG(); }); } }
         );
     }
 
-    public static void OnReceiveRoomData(ISFSArray sfsArray)
+    public static void OnReceiveNormalRoomData(ISFSArray sfsArray)
     {
         //Debug.LogWarning("receive " + sfsArray.Count);
 
-        int count = RoomDatas.Count;
+        int count = NormalRoomDatas.Count;
         for (int i = 0; i < sfsArray.Count; i++)
         {
             RoomData roomData = new RoomData(sfsArray.GetSFSObject(i));
-            if (!RoomDatas.Values.Contains(roomData))
+            if (!NormalRoomDatas.Values.Contains(roomData))
             {
-                RoomDatas.Add(count + i, roomData);
+                NormalRoomDatas.Add(count + i, roomData);
             }
         }
 
-        if (FilterEnabled)
+        if (FilterFlag)
         {
             return;
         }
@@ -147,16 +151,16 @@ public class PlazaRoomManager : Regist
 
         if (sfsArray.Count == 0)
         {
-            DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; });
+            DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; });
         }
         else
         {
-            int availableItemAmt = MaxRoomItem - PlazaRoomItems.Count;
-            NextPage(availableItemAmt, ref FirstIndex, ref LastIndex, RoomDatas);
-            DownloadLock = false;
+            int availableItemAmt = ScrollRectMaxDisplayAmt - NormalPlazaRoomItems.Count;
+            NextRoomPage(availableItemAmt, ref NormalFirstDisplayIndex, ref NormalLastDisplayIndex, NormalRoomDatas);
+            DownloadDataFlag = false;
         }
 
-        RefreshRoomStatus(PlazaRoomItems);
+        RefreshRoomStatus(NormalPlazaRoomItems);
     }
 
     public static void OnReceiveCustomRoomData(ISFSArray sfsArray)
@@ -173,7 +177,7 @@ public class PlazaRoomManager : Regist
             }
         }
 
-        if (!FilterEnabled)
+        if (!FilterFlag)
         {
             return;
         }
@@ -183,13 +187,13 @@ public class PlazaRoomManager : Regist
 
         if (sfsArray.Count == 0)
         {
-            DelayCall.Call(DownLoadTimespan, () => { DownloadLock = false; });
+            DelayCall.Call(DownLoadDataTime, () => { DownloadDataFlag = false; });
         }
         else
         {
-            int availableItemAmt = MaxRoomItem - PlazaRoomItems.Count;
-            NextPage(availableItemAmt, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
-            DownloadLock = false;
+            int availableItemAmt = ScrollRectMaxDisplayAmt - NormalPlazaRoomItems.Count;
+            NextRoomPage(availableItemAmt, ref CustomFirstDisplayIndex, ref CustomLastDisplayIndex, CustomRoomDatas);
+            DownloadDataFlag = false;
         }
 
         RefreshRoomStatus(CustomPlazaRoomItems);
@@ -197,7 +201,7 @@ public class PlazaRoomManager : Regist
 
     public static void OnReceiveRoomFullStatus(List<int> ids, List<bool> statuses)
     {
-        foreach (var plazaRoomItem in PlazaRoomItems)
+        foreach (var plazaRoomItem in NormalPlazaRoomItems)
         {
             int index = ids.IndexOf(plazaRoomItem.RoomData.ID);
             if (index != -1)
@@ -208,45 +212,44 @@ public class PlazaRoomManager : Regist
     }
 
 
-    private static int PageVolume = 5;
-    public static void NextPageGate()
+    public static void NextRoomPage()
     {
-        if (FilterEnabled)
+        if (FilterFlag)
         {
-            NextPage(PageVolume, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
+            NextRoomPage(ScrollRectPageVolume, ref CustomFirstDisplayIndex, ref CustomLastDisplayIndex, CustomRoomDatas);
         }
         else
         {
-            NextPage(PageVolume, ref FirstIndex, ref LastIndex, RoomDatas);
+            NextRoomPage(ScrollRectPageVolume, ref NormalFirstDisplayIndex, ref NormalLastDisplayIndex, NormalRoomDatas);
         }
     }
 
-    public static void PreviousPageGate()
+    public static void PreviousRoomPage()
     {
-        if (FilterEnabled)
+        if (FilterFlag)
         {
-            PreviousPage(PageVolume, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
+            PreviousRoomPage(ScrollRectPageVolume, ref CustomFirstDisplayIndex, ref CustomLastDisplayIndex, CustomRoomDatas);
         }
         else
         {
-            PreviousPage(PageVolume, ref FirstIndex, ref LastIndex, RoomDatas);
+            PreviousRoomPage(ScrollRectPageVolume, ref NormalFirstDisplayIndex, ref NormalLastDisplayIndex, NormalRoomDatas);
         }
     }
 
-    public static void NextPage(int nextAmt, ref int firstIndex, ref int lastIndex, Dictionary<int, RoomData> dictionary)
+    public static void NextRoomPage(int nextAmt, ref int firstIndex, ref int lastIndex, Dictionary<int, RoomData> dictionary)
     {
         if (lastIndex >= dictionary.Count)
         {
-            if (!DownloadLock)
+            if (!DownloadDataFlag)
             {
                 //Debug.LogWarning("Download Page");
-                if (FilterEnabled)
+                if (FilterFlag)
                 {
                     DownloadCustomRoomData();   
                 }
                 else
                 {
-                    DownloadRoomData();
+                    DownloadNormalRoomData();
                 }
             }
         }
@@ -268,7 +271,7 @@ public class PlazaRoomManager : Regist
         }
     }
 
-    public static void PreviousPage(int nextAmt, ref int firstIndex, ref int lastIndex, Dictionary<int, RoomData> dictionary)
+    public static void PreviousRoomPage(int nextAmt, ref int firstIndex, ref int lastIndex, Dictionary<int, RoomData> dictionary)
     {
         if (firstIndex == 0)
         {
@@ -290,10 +293,9 @@ public class PlazaRoomManager : Regist
         }
     }
 
-    private static int MaxRoomItem = 10;
     private static void CreateNextRoomItem(ref int firstIndex, ref int lastIndex, RoomData roomData)
     {
-        if (PlazaRoomItems.Count >= MaxRoomItem)
+        if (NormalPlazaRoomItems.Count >= ScrollRectMaxDisplayAmt)
         {
             firstIndex++;
             lastIndex++;
@@ -308,13 +310,13 @@ public class PlazaRoomManager : Regist
         {
             lastIndex++;
 
-            PlazaRoomItems.Add(roomData.CreateItem().Init(roomData));
+            NormalPlazaRoomItems.Add(roomData.CreateItem().Init(roomData));
         }
     }
 
     private static void CreatePreviousRoomItem(ref int firstIndex, ref int lastIndex, RoomData roomData)
     {
-        if (PlazaRoomItems.Count >= MaxRoomItem)
+        if (NormalPlazaRoomItems.Count >= ScrollRectMaxDisplayAmt)
         {
             firstIndex--;
             lastIndex--;
@@ -328,68 +330,68 @@ public class PlazaRoomManager : Regist
     }
 
 
-    public static void OpenPanel()
+    public static void OpenJoinRoomPanel()
     {
-        if (!DownloadLock)
+        if (!DownloadDataFlag)
         {
-            DownloadRoomData();
+            DownloadNormalRoomData();
             DownloadCustomRoomData();
         }
         OnSliderValueChange(0);
         ResourceManager.Get(ObjectLabel.Z_BK).TweenForCG();
     }
 
-    public static void ClosePanel()
+    public static void CloseJoinRoomPanel()
     {
         ResourceManager.Get(ObjectLabel.Z_BK).TweenBacCG();
     }
 
-    public static void EnableFilter()
+    public static void EnableCreateByMeFilter()
     {
-        FilterEnabled = true;
+        FilterFlag = true;
         ResourceManager.SetActive(ObjectLabel.Z_InfoImg51, true);
-        ClearGrid();
-        NextPage(PageVolume, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
+        ClearScrollRect();
+        NextRoomPage(ScrollRectPageVolume, ref CustomFirstDisplayIndex, ref CustomLastDisplayIndex, CustomRoomDatas);
     }
 
-    public static void DisableFilter()
+    public static void DisableCreateByMeFilter()
     {
-        FilterEnabled = false;
+        FilterFlag = false;
         ResourceManager.SetActive(ObjectLabel.Z_InfoImg51, false);
-        ClearGrid();
-        NextPage(PageVolume, ref FirstIndex, ref LastIndex, RoomDatas);
+        ClearScrollRect();
+        NextRoomPage(ScrollRectPageVolume, ref NormalFirstDisplayIndex, ref NormalLastDisplayIndex, NormalRoomDatas);
     }
 
-    private static void ClearGrid()
+    private static void ClearScrollRect()
     {
-        LastIndex = 0;
-        FirstIndex = 0;
-        CustomLastIndex = 0;
-        CustomFirstIndex = 0;
+        NormalLastDisplayIndex = 0;
+        NormalFirstDisplayIndex = 0;
+        CustomLastDisplayIndex = 0;
+        CustomFirstDisplayIndex = 0;
 
         while (Grid.childCount > 0)
         {
             ResourceManager.Save(Grid.GetChild(0));
         }
 
-        PlazaRoomItems = new List<PlazaRoomItem>();
+        NormalPlazaRoomItems = new List<PlazaRoomItem>();
 
         ResourceManager.Get(ObjectLabel.Z_Tip).GetTweenCG().InOrigin = true;
 
-        DownloadLock = false;
+        DownloadDataFlag = false;
     }
 
 
-    public static int Cost;
-    public static int Duration;
-    public static int MaxPlayer;
+    public static int CreateRoom_Cost;
+    public static int CreateRoom_Duration;
+    public static int CreateRoom_MaxPlayer;
     public static int MaxRoomNameChar = 24;
-    public static string CostFml;
-    public static string ValueFml;
-    private static Text DurationLab;
-    private static Text MaxPlayerLab;
-    private static Slider DurationSlider;
-    private static Slider MaxPlayerSlider;
+    public static string CreateRoom_CostFml;
+    public static string DefaultRoomValueFml;
+    private static Text CreateRoom_DurationText;
+    private static Text CreateRoom_MaxPlayerText;
+    private static Slider CreateRoom_DurationSlider;
+    private static Slider CreateRoom_MaxPlayerSlider;
     public static void CreateRoom()
     {
         string roomName = ResourceManager.Get<InputField>(ObjectLabel.AA_InputField).text;
@@ -416,8 +418,8 @@ public class PlazaRoomManager : Regist
         ResourceManager.Get(ObjectLabel.AA_Tip).TweenForCG();
         ResourceManager.Get<CanvasGroup>(ObjectLabel.AA_CreatePlazaRoom).interactable = false;
 
-        int value = (int) Auxiliary.FmlParse(ValueFml, "c", Cost.ToString(), "p", MaxPlayer.ToString(), "h", Duration.ToString());
-        SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CreateRoom(roomName, long.Parse(HttpManager.SerialNumber), Duration, MaxPlayer, value);
+        int value = (int) Auxiliary.FmlParse(DefaultRoomValueFml, "c", CreateRoom_Cost.ToString(), "p", CreateRoom_MaxPlayer.ToString(), "h", CreateRoom_Duration.ToString());
+        SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CreateRoom(roomName, long.Parse(HttpManager.SerialNumber), CreateRoom_Duration, CreateRoom_MaxPlayer, value);
     }
 
     public static void OnCreateRoomError()
@@ -431,22 +433,22 @@ public class PlazaRoomManager : Regist
 
     public static void OnCreateRoomSucceed(RoomData roomData)
     {
-        if (!RoomDatas.Values.Contains(roomData))
+        if (!NormalRoomDatas.Values.Contains(roomData))
         {
-            RoomDatas.Add(RoomDatas.Count, roomData);
+            NormalRoomDatas.Add(NormalRoomDatas.Count, roomData);
         }
         if (!CustomRoomDatas.Values.Contains(roomData))
         {
             CustomRoomDatas.Add(CustomRoomDatas.Count, roomData);
         }
-        int availableItemAmt = MaxRoomItem - PlazaRoomItems.Count;
-        if (FilterEnabled)
+        int availableItemAmt = ScrollRectMaxDisplayAmt - NormalPlazaRoomItems.Count;
+        if (FilterFlag)
         {
-            NextPage(availableItemAmt, ref CustomFirstIndex, ref CustomLastIndex, CustomRoomDatas);
+            NextRoomPage(availableItemAmt, ref CustomFirstDisplayIndex, ref CustomLastDisplayIndex, CustomRoomDatas);
         }
         else
         {
-            NextPage(availableItemAmt, ref FirstIndex, ref LastIndex, RoomDatas);
+            NextRoomPage(availableItemAmt, ref NormalFirstDisplayIndex, ref NormalLastDisplayIndex, NormalRoomDatas);
         }
 
 
@@ -455,25 +457,25 @@ public class PlazaRoomManager : Regist
         LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.AA_Tip), new MulLanStr(LanguageLabel.UI__AA_CreateSucceed));
         ResourceManager.Get(ObjectLabel.AA_Tip).TweenBacCG();
         ResourceManager.Get<CanvasGroup>(ObjectLabel.AA_CreatePlazaRoom).interactable = true;
-        DownloadRoomData();
+        DownloadNormalRoomData();
 
-        Manager.AddDiamond(-Cost, StaticsManager.ItemID.创建派对, StaticsManager.ConsumeModule.Charge);
+        Manager.AddDiamond(-CreateRoom_Cost, StaticsManager.ItemID.创建派对, StaticsManager.ConsumeModule.Charge);
 
-        PlazaRoomItem.OnJoinBtn(roomData);
-        CloseCreatePanel();
+        PlazaRoomItem.OnJoinBtnClick(roomData);
+        CloseCreateRoomPanel();
     }
 
     public static void OnSliderValueChange(float value)
     {
-        Duration = (int) DurationSlider.value;
-        MaxPlayer = (int) MaxPlayerSlider.value;
-        DurationLab.text = Duration + Language.GetStr(LanguageLabel.UI__AAa_Value);
-        MaxPlayerLab.text = MaxPlayer + Language.GetStr(LanguageLabel.UI__AAb_Value);
+        CreateRoom_Duration = (int) CreateRoom_DurationSlider.value;
+        CreateRoom_MaxPlayer = (int) CreateRoom_MaxPlayerSlider.value;
+        CreateRoom_DurationText.text = CreateRoom_Duration + Language.GetStr(LanguageLabel.UI__AAa_Value);
+        CreateRoom_MaxPlayerText.text = CreateRoom_MaxPlayer + Language.GetStr(LanguageLabel.UI__AAb_Value);
 
-        Cost = (int) Auxiliary.FmlParse(CostFml, "h", Duration.ToString(), "p", MaxPlayer.ToString());
-        ResourceManager.SetText(ObjectLabel.AA_Desc, Language.GetStr(LanguageLabel.UI__AA_Cost) + TransferLabel.DiamondSprite + Cost);
+        CreateRoom_Cost = (int) Auxiliary.FmlParse(CreateRoom_CostFml, "h", CreateRoom_Duration.ToString(), "p", CreateRoom_MaxPlayer.ToString());
+        ResourceManager.SetText(ObjectLabel.AA_Desc, Language.GetStr(LanguageLabel.UI__AA_Cost) + TransferLabel.DiamondSprite + CreateRoom_Cost);
         
-        if (Cost > Manager.Diamond)
+        if (CreateRoom_Cost > Manager.Diamond)
         {
             ResourceManager.SetText(ObjectLabel.AA_BtnLab, Language.GetStr(LanguageLabel.UI__AA_NoEnoughDiamond));
             ResourceManager.Get<Button>(ObjectLabel.AA_Btn).image.material = Lib.GrayMat;
@@ -487,7 +489,7 @@ public class PlazaRoomManager : Regist
         }
     }
 
-    public static void OpenCreatePanel()
+    public static void OpenCreateRoomPanel()
     {
         ResourceManager.Get(ObjectLabel.AA_CreatePlazaRoom).TweenForCG();
 
@@ -495,7 +497,7 @@ public class PlazaRoomManager : Regist
         ResourceManager.Get<InputField>(ObjectLabel.AA_InputField).text = defaultName;
     }
 
-    public static void CloseCreatePanel()
+    public static void CloseCreateRoomPanel()
     {
         ResourceManager.Get(ObjectLabel.AA_CreatePlazaRoom).TweenBacCG();
     }

Assets/Script/Manage/ResourceManager.cs

@@ -34,7 +34,7 @@ public enum ObjType
 
     Player,
 
-    Page,
+    SlotPage,
     Flower,
     Garden,
     Tutorial,
@@ -42,11 +42,6 @@ public enum ObjType
     DressRoom,
 
     Canvas,
-    GroupA,
-    GroupB,
-    GroupC,
-    GroupD,
-    GroupE,
     EventSystem,
     MainCamera,
 
@@ -55,8 +50,8 @@ public enum ObjType
     MessageBox,
     HudText,
     MailItem,
-    C_InfoItem,
-    X_InfoItem,
+    GardenInfoItem,
+    PlazaroomInfoItem,
     SkillItem,
     SignItem,
     RankItem,
@@ -91,27 +86,25 @@ public class ResourceManager : Regist
 {
     #region Config
 
-    public static bool AsyncLoadLock;
-    public static bool AsyncInstantiateLock;
+    public static bool AsyncLoadFlag;
+    public static bool AsyncInstantiateFlag;
 
-    public static Coroutine CoroLoad;
-    public static Coroutine CoroInstantiate;
-
-    public static ResourceManager Instance;
+    public static Coroutine AsyncLoadRoutine;
+    public static Coroutine InstantiateRoutine;
 
     public static List<UnityAction> AsyncList = new List<UnityAction>();
     public static List<AssetBundleRequest> RequestList = new List<AssetBundleRequest>();
-
     public static List<KV<AsyncRequest, UnityAction>> InstantiateList = new List<KV<AsyncRequest, UnityAction>>();
 
+    private static string UnityDefaultSuffix = "(Clone)";
 
-    public static Dictionary<string, Object> ObjDic = new Dictionary<string, Object>();
-    public static Dictionary<string, Sprite> SpriteDic = new Dictionary<string, Sprite>();
-
-    public static Dictionary<string, Transform> TraDic = new Dictionary<string, Transform>();
-    public static Dictionary<GameObject, ObjType> ObjPoolDic = new Dictionary<GameObject, ObjType>();
-
+    public static Dictionary<string, Sprite> SpriteDictionary = new Dictionary<string, Sprite>();
+    public static Dictionary<string, Object> ObjectDictionary = new Dictionary<string, Object>();
+    public static Dictionary<string, Transform> TransformDictionary = new Dictionary<string, Transform>();
     public static Dictionary<ObjType, List<Transform>> ObjectPool = new Dictionary<ObjType, List<Transform>>();
+    public static Dictionary<GameObject, ObjType> ObjectPoolDictionary = new Dictionary<GameObject, ObjType>();
+
+    public static ResourceManager Instance;
 
     #endregion
 
@@ -129,22 +122,21 @@ public class ResourceManager : Regist
         objPool.parent = transform;
         objPool.SetActive(false);
 
-        TraDic.Add(objPool.name, objPool);
+        TransformDictionary.Add(objPool.name, objPool);
 
-        CoroLoad = StartCoroutine(IAsyncLoad());
-        CoroInstantiate = StartCoroutine(IAsyncInstancitate());
+        AsyncLoadRoutine = StartCoroutine(IAsyncLoad());
+        InstantiateRoutine = StartCoroutine(IAsyncInstancitate());
 
         return false;
     }
 
-
-    #region TraDic
+    #region TransformDictionary
 
     public static T Get<T>(string goName, bool warn = true)
     {
         Transform tra;
 
-        if (TraDic.TryGetValue(goName, out tra))
+        if (TransformDictionary.TryGetValue(goName, out tra))
         {
             T t = tra.GetComponent<T>();
 
@@ -172,7 +164,7 @@ public class ResourceManager : Regist
     {
         Transform tra;
 
-        if (TraDic.TryGetValue(goName, out tra))
+        if (TransformDictionary.TryGetValue(goName, out tra))
         {
             T[] t = tra.GetComponentsInChildren<T>();
 
@@ -200,7 +192,7 @@ public class ResourceManager : Regist
     {
         Transform tra;
 
-        if (TraDic.TryGetValue(goName, out tra))
+        if (TransformDictionary.TryGetValue(goName, out tra))
         {
             return tra;
         }
@@ -221,12 +213,6 @@ public class ResourceManager : Regist
 
     #region ObjPool
 
-    public static void Release()
-    {
-        Bundle.Discard.Unload(false);
-    }
-
-
     public static void Save<T>(T t, bool warn = false) where T : Component
     {
         Save(t.gameObject);
@@ -236,7 +222,7 @@ public class ResourceManager : Regist
     {
         ObjType objType;
 
-        if (!ObjPoolDic.TryGetValue(go, out objType))
+        if (!ObjectPoolDictionary.TryGetValue(go, out objType))
         {
             throw new Exception();
         }
@@ -423,7 +409,7 @@ public class ResourceManager : Regist
     {
         Object obj;
 
-        if (ObjDic.TryGetValue(goName, out obj))
+        if (ObjectDictionary.TryGetValue(goName, out obj))
         {
             if (objType != ObjType.Null)
             {
@@ -441,7 +427,7 @@ public class ResourceManager : Regist
                 throw new Exception(goName + " " + folder);
             }
 
-            ObjDic.Add(goName, t);
+            ObjectDictionary.Add(goName, t);
 
             if (objType != ObjType.Null)
             {
@@ -454,9 +440,9 @@ public class ResourceManager : Regist
 
     public static Sprite LoadSprite(string goName, Folder folder)
     {
-        if (SpriteDic.ContainsKey(goName))
+        if (SpriteDictionary.ContainsKey(goName))
         {
-            return SpriteDic[goName];
+            return SpriteDictionary[goName];
         }
         else
         {
@@ -465,7 +451,6 @@ public class ResourceManager : Regist
     }
 
 
-    private static string UnityDefaultSuffix = "(Clone)";
     public static Transform Get(string goName, Folder folder, bool compile, Transform par, bool worldSpace, ObjType objType = ObjType.Null, Type type = null)
     {
         Transform tra = Get(objType);
@@ -479,12 +464,12 @@ public class ResourceManager : Regist
 
             if (compile)
             {
-                Auxiliary.CompileDic(go.transform, TraDic);
+                Auxiliary.CompileDic(go.transform, TransformDictionary);
             }
 
             if (objType != ObjType.Null)
             {
-                ObjPoolDic.Add(go, objType);
+                ObjectPoolDictionary.Add(go, objType);
             }
 
             if (type != null)
@@ -498,7 +483,7 @@ public class ResourceManager : Regist
         {
             if (compile)
             {
-                Auxiliary.CompileDic(tra, TraDic);
+                Auxiliary.CompileDic(tra, TransformDictionary);
             }
 
             GameObject prefab = Load<GameObject>(goName, folder, objType);
@@ -539,12 +524,12 @@ public class ResourceManager : Regist
 
             if (compile)
             {
-                Auxiliary.CompileDic(go.transform, TraDic);
+                Auxiliary.CompileDic(go.transform, TransformDictionary);
             }
 
             if (objType != ObjType.Null)
             {
-                ObjPoolDic.Add(go, objType);
+                ObjectPoolDictionary.Add(go, objType);
             }
 
             if (type != null)
@@ -558,7 +543,7 @@ public class ResourceManager : Regist
         {
             if (compile)
             {
-                Auxiliary.CompileDic(tra, TraDic);
+                Auxiliary.CompileDic(tra, TransformDictionary);
             }
 
             tra.SetParent(par);
@@ -582,12 +567,12 @@ public class ResourceManager : Regist
     private static float StarMaxOffset = -0.001f;
     public static Star GetStar()
     {
-        int slotIndex = Random.Range(0, GardenManager.TotalSlotAmtInOnePage);
+        int slotIndex = Random.Range(0, GardenManager.TotalSlotInOnePage);
 
         bool forceLeft = slotIndex == GardenManager.RightTopSlotIndex || slotIndex == GardenManager.RightDownSlotIndex;
         bool forceRight = slotIndex == GardenManager.LeftTopSlotIndex || slotIndex == GardenManager.LeftDownSlotIndex;
 
-        slotIndex += Garden.CurPage* GardenManager.TotalSlotAmtInOnePage;
+        slotIndex += Garden.CurrentPage* GardenManager.TotalSlotInOnePage;
 
 
         Slot slot = GardenManager.SlotList[slotIndex];
@@ -605,16 +590,17 @@ public class ResourceManager : Regist
         {
             star = tra.AddComponent<Star>();
 
-            star.Initialize(pos.y, forceLeft, forceRight);
+            star.Init(pos.y, forceLeft, forceRight);
         }
         else
         {
-            star.Initialize(pos.y, forceLeft, forceRight);
+            star.Init(pos.y, forceLeft, forceRight);
         }
 
         return star;
     }
 
+
     public static ADChest GetADChest()
     {
         Transform tra = Get(ResourceLabel.ADChest, Folder.Scene, false, Get(GardenLabel.SlotPage), true, ObjType.ADChest);
@@ -625,16 +611,17 @@ public class ResourceManager : Regist
         {
             chest = tra.GetChild(0).AddComponent<ADChest>();
 
-            chest.Initialize(tra.position.y, false, false);
+            chest.Init(tra.position.y, false, false);
         }
         else
         {
-            chest.Initialize(tra.position.y, false, false);
+            chest.Init(tra.position.y, false, false);
         }
 
         return chest;
     }
 
+
     public static PlazaRoomChest GetPlazaRoomChest(Vector3 position)
     {
         Transform tra = Get(ResourceLabel.PlazaRoomChest, Folder.Scene, false, Get(ResourceLabel.PlazaRoom), position, ObjType.PlazaRoomChest);
@@ -649,20 +636,21 @@ public class ResourceManager : Regist
         return chest;
     }
 
+
     public static Drop GetDrop(ObjType objType)
     {
         AudioManager.PlayClip(AudioLabel.Minigame_DropAward);
 
-        Vector3 leftPos = Get(GardenLabel.MiniLeft).position;
+        Vector3 leftPos = Get(GardenLabel.Minigame_DropAward_LeftBorder).position;
         Vector3 rightPos;
 
-        if (MiniGameManager.PunchGame || MiniGameManager.FindGame)
+        if (MiniGameManager.miniGameType == MiniGameManager.MiniGameType.Punch || MiniGameManager.miniGameType == MiniGameManager.MiniGameType.Find)
         {
-            rightPos = Get(GardenLabel.MiniRight1).position;
+            rightPos = Get(GardenLabel.FindMinigame_DropAward_RightBorder).position;
         }
         else
         {
-            rightPos = Get(GardenLabel.MiniRight2).position;
+            rightPos = Get(GardenLabel.MemoryMinigame_DropAward_RightBorder).position;
         }
 
         Vector3 pos = Vector3.Lerp(leftPos, rightPos, Random.Range(0, 1f));
@@ -704,7 +692,6 @@ public class ResourceManager : Regist
         flower.FlowerInfo = flowerInfo;
         flower.Slot = slot;
 
-        flower.SetShadow();
         flower.SetCollider(collider);
 
         return flower;
@@ -722,7 +709,6 @@ public class ResourceManager : Regist
 
         flower.FlowerInfo = flowerInfo;
 
-        flower.SetShadow();
         flower.SetCollider(false);
 
         return flower;
@@ -745,6 +731,7 @@ public class ResourceManager : Regist
         return text;
     }
 
+
     public static HudText GetHudText(string str, Color color, int size, Transform posTra, Transform parTra, bool scene, float speed = 7.5f, float time = 0.5f, float stay = 0.5f)
     {
         Vector3 pos;
@@ -781,6 +768,7 @@ public class ResourceManager : Regist
         return ranktem;
     }
 
+
     public static CommentItem GetCommentItem(string nickname, string serialNumber, string content)
     {
         Transform tra = Get(ResourceLabel.CommentItem, Folder.UI, false, Get(ObjectLabel.Q_Grid), false, ObjType.CommentItem, typeof(CommentItem));
@@ -838,12 +826,13 @@ public class ResourceManager : Regist
         tra.position += new Vector3(offsetX, offsetY, 0);
 
 
-        elf.Flower = flower;
+        elf.ParentFlower = flower;
         elf.Animator.SetTrigger("Play");
 
         return tra;
     }
 
+
     public static Transform GetSkillItem(SkillRoot skillRoot)
     {
         Transform tra;
@@ -874,6 +863,7 @@ public class ResourceManager : Regist
         return tra;
     }
 
+
     public static Transform GetAchieveItem()
     {
         Transform tra = Get(ResourceLabel.AchieveItem, Folder.UI, false, Get(ObjectLabel.M_Grid), false, ObjType.AchieveItem);
@@ -893,6 +883,7 @@ public class ResourceManager : Regist
         return particle;
     }
 
+
     public static ParticleSystem GetLightwall()
     {
         Transform tra = Get(ResourceLabel.LightwallUI, Folder.Effect, false, Get(ObjectLabel.Canvas), false, ObjType.LightwallUI, typeof(Effect));
@@ -919,7 +910,7 @@ public class ResourceManager : Regist
         kv.Key = asyncRequest;
         kv.Value = () =>
         {
-            ObjDic.UniqueAdd(goName, bundleRequest.asset);
+            ObjectDictionary.UniqueAdd(goName, bundleRequest.asset);
         };
 
         RequestList.Add(bundleRequest);
@@ -940,7 +931,7 @@ public class ResourceManager : Regist
         kv.Key = asyncRequest;
         kv.Value = () =>
         {
-            ObjDic.UniqueAdd(goName, bundleRequest.asset);
+            ObjectDictionary.UniqueAdd(goName, bundleRequest.asset);
 
             if (objType != ObjType.Null)
             {
@@ -958,7 +949,7 @@ public class ResourceManager : Regist
                 go = (GameObject)Instantiate(bundleRequest.asset);
             }
 
-            ObjPoolDic.Add(go, objType);
+            ObjectPoolDictionary.Add(go, objType);
 
             go.name = go.name.Replace(UnityDefaultSuffix, "");
 
@@ -1002,10 +993,10 @@ public class ResourceManager : Regist
     }
 
 
-    public void StopAsync()
+    public void StopAllAsync()
     {
-        StopCoroutine(CoroLoad);
-        StopCoroutine(CoroInstantiate);
+        StopCoroutine(AsyncLoadRoutine);
+        StopCoroutine(InstantiateRoutine);
     }
 
     public static IEnumerator IAsyncLoad()
@@ -1018,15 +1009,15 @@ public class ResourceManager : Regist
             }
             else
             {
-                if (AsyncList.Valid() && !AsyncLoadLock)
+                if (AsyncList.Valid() && !AsyncLoadFlag)
                 {
-                    AsyncLoadLock = true;
+                    AsyncLoadFlag = true;
 
                     Auxiliary.Instance.DelayCall
                     (
                         () =>
                         {
-                            AsyncLoadLock = false;
+                            AsyncLoadFlag = false;
 
                             AsyncList[0].SafeInvoke();
 
@@ -1049,7 +1040,7 @@ public class ResourceManager : Regist
     {
         while (true)
         {
-            if (AsyncInstantiateLock)
+            if (AsyncInstantiateFlag)
             {
                 yield return null;
             }
@@ -1079,7 +1070,7 @@ public class ResourceManager : Regist
 
                     InstantiateList.RemoveAt(0);
 
-                    AsyncInstantiateLock = true;
+                    AsyncInstantiateFlag = true;
 
                     Auxiliary.Instance.DelayCall
                     (
@@ -1089,7 +1080,7 @@ public class ResourceManager : Regist
                             {
                                 action.SafeInvoke();
 
-                                AsyncInstantiateLock = false;
+                                AsyncInstantiateFlag = false;
                             }
                         },
                         1

Assets/Script/Manage/SignManager.cs

@@ -11,13 +11,13 @@ using Random = UnityEngine.Random;
 
 public class SignItemLabel
 {
-    public static string Lab1 = "Lab1";
-    public static string Lab2 = "Lab2";
-    public static string Icon1 = "Icon1";
-    public static string Icon2 = "Icon2";
+    public static string Amount = "Amount";
+    public static string Index = "Index";
+    public static string Award = "Award";
+    public static string Tick = "Tick";
 }
 
-public class Sign
+public class SignItem
 {
     #region Config
 
@@ -27,99 +27,102 @@ public class Sign
         {
             if (RoundBuff.Equal(-1))
             {
-                return Coin_;
+                return coin;
             }
             else
             {
-                return (int)(Coin_*RoundBuff*SignManager.SignRound);
+                return (int)(coin*RoundBuff*SignManager.SignRound);
             }
         }
-        set { Coin_ = value; }
+        set { coin = value; }
     }
+    public int coin;
+
     public int Diamond
     {
         get
         {
             if (RoundBuff.Equal(-1))
             {
-                return Diamond_;
+                return diamond;
             }
             else
             {
-                return (int)(Diamond_ * RoundBuff * SignManager.SignRound);
+                return (int)(diamond * RoundBuff * SignManager.SignRound);
             }
         }
-        set { Diamond_ = value; }
+        set { diamond = value; }
     }
+    public int diamond;
+
+    public float RoundBuff; //第几轮 每签21次加一轮
 
-    public int Coin_;
-    public int Diamond_;
+    public bool LotteryAwardFlag;
 
-    public float RoundBuff;
-    public bool IsLottery;
+    public Text AmountText;
+    public Text IndexText;
+    public Image Award;
+    public Image Tick;
+    public Vector2 OriginSpriteSize;
 
-    public Text Lab1;
-    public Text Lab2;
-    public Image Icon;
-    public Image Mark;
-    public Vector2 OriginSize;
+    public List<int> AwardFlowerIDs = new List<int>();
 
-    public List<int> FlowerList = new List<int>();
+    public static int MaxSignIndex = 22;
 
     #endregion
 
-    public Sign(int index, Transform tra, XmlAttributeCollection attribute)
+    public SignItem(int index, Transform tra, XmlAttributeCollection attribute)
     {
         Dictionary<string, Transform> dic = new Dictionary<string, Transform>();
 
         Auxiliary.CompileDic(tra, dic);
 
-        Lab1 = dic[SignItemLabel.Lab1].GetComponent<Text>();
-        Lab2 = dic[SignItemLabel.Lab2].GetComponent<Text>();
+        AmountText = dic[SignItemLabel.Amount].GetComponent<Text>();
+        IndexText = dic[SignItemLabel.Index].GetComponent<Text>();
 
-        Icon = dic[SignItemLabel.Icon1].GetComponent<Image>();
-        Mark = dic[SignItemLabel.Icon2].GetComponent<Image>();
+        Award = dic[SignItemLabel.Award].GetComponent<Image>();
+        Tick = dic[SignItemLabel.Tick].GetComponent<Image>();
 
-        OriginSize = Icon.rectTransform.sizeDelta;
+        OriginSpriteSize = Award.rectTransform.sizeDelta;
 
 
-        Lab2.text = index.ToString();
+        IndexText.text = index.ToString();
 
         Coin = Auxiliary.StringToInt(attribute[4].Value, 0);
-        IsLottery = Auxiliary.StringToBool(attribute[1].Value, false);
+        LotteryAwardFlag = Auxiliary.StringToBool(attribute[1].Value, false);
         Diamond = Auxiliary.StringToInt(attribute[3].Value, 0);
-        FlowerList = Auxiliary.StringToInts(',', attribute[2].Value, new List<int>());
+        AwardFlowerIDs = Auxiliary.StringToInts(',', attribute[2].Value, new List<int>());
         RoundBuff = Auxiliary.StringToFloat(attribute[5].Value, -1);
 
-        SetUI();
+        SetupUI();
     }
 
 
     public void Get()
     {
-        if (IsLottery)
+        if (LotteryAwardFlag)
         {
-            Lottery.EnterAnimation(true);
+            Lottery.PlayAnimation(true);
 
             return;
         }
 
         AudioManager.PlayClip(AudioLabel.GetCurrent);
 
-        Mark.SetActive(true);
+        Tick.SetActive(true);
 
-        ResetSign();
+        ResetSignRound();
 
 
         ResourceManager.SetActive(ObjectLabel.Bb_Get, false);
         ResourceManager.SetActive(ObjectLabel.Bb_Rotate, true);
         ResourceManager.SetActive(ObjectLabel.Bb_Confirm, true);
 
-        if (FlowerList.Valid())
+        if (AwardFlowerIDs.Valid())
         {
-            for (int i = 0; i < FlowerList.Count; i++)
+            for (int i = 0; i < AwardFlowerIDs.Count; i++)
             {
-                FlowerInfo flowerInfo = GardenManager.FlowerInfoDic[FlowerList[i]];
+                FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[AwardFlowerIDs[i]];
 
                 if (flowerInfo.Unlock == false)
                 {
@@ -164,26 +167,26 @@ public class Sign
         }
     }
 
-    public void SetUI()
+    public void SetupUI()
     {
-        if (IsLottery)
+        if (LotteryAwardFlag)
         {
-            Icon.sprite = Lib.PackSprite;
-            Icon.Resize(true, 0.3f, 0.3f);
+            Award.sprite = Lib.PackSprite;
+            Award.Resize(true, 0.3f, 0.3f);
 
             return;
         }
 
-        if (FlowerList.Valid())
+        if (AwardFlowerIDs.Valid())
         {
-            for (int i = 0; i < FlowerList.Count; i++)
+            for (int i = 0; i < AwardFlowerIDs.Count; i++)
             {
-                FlowerInfo flowerInfo = GardenManager.FlowerInfoDic[FlowerList[i]];
+                FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[AwardFlowerIDs[i]];
 
                 if (flowerInfo.Unlock == false)
                 {
-                    Icon.sprite = flowerInfo.Icon;
-                    Icon.Resize(true, 0.1875f, 0.1875f);
+                    Award.sprite = flowerInfo.Icon;
+                    Award.Resize(true, 0.1875f, 0.1875f);
 
                     return;
                 }
@@ -192,24 +195,24 @@ public class Sign
         
         if (Diamond > 0)
         {
-            Icon.sprite = Lib.DiamondSprite;
-            Icon.Resize(false, OriginSize);
+            Award.sprite = Lib.DiamondSprite;
+            Award.Resize(false, OriginSpriteSize);
 
-            Lab1.text = Diamond.ToString();
+            AmountText.text = Diamond.ToString();
         }
         else if (Coin > 0)
         {
-            Icon.sprite = Lib.GoldSprite;
-            Icon.Resize(false, OriginSize);
+            Award.sprite = Lib.GoldSprite;
+            Award.Resize(false, OriginSpriteSize);
 
-            Lab1.text = Coin.ToString();
+            AmountText.text = Coin.ToString();
         }
     }
 
-    private static int MaxSignIndex = 22;
-    public static void ResetSign()
+
+    public static void ResetSignRound()
     {
-        SignManager.SignTime = HttpManager.Time;
+        SignManager.LastSignTime = HttpManager.CurrentDateTime;
 
         SignManager.SignIndex++;
 
@@ -223,11 +226,11 @@ public class Sign
                 EventType.BackwardFinish,
                 () =>
                 {
-                    foreach (var kv in SignManager.SignDic)
+                    foreach (var kv in SignManager.SignItemDictionary)
                     {
-                        kv.Value.SetUI();
+                        kv.Value.SetupUI();
 
-                        kv.Value.Mark.SetActive(false);
+                        kv.Value.Tick.SetActive(false);
                     }
                 }
             );
@@ -247,10 +250,10 @@ public class Lottery
 
     #region Config
 
-    public int PosIndex;
+    public int Index;
     public int Type;
     public int Value;
-    public Text Lab;
+    public Text DescriptionText;
     public Image Icon1;
     public Image Icon2;
     public Image Icon3;
@@ -258,21 +261,21 @@ public class Lottery
     public Transform BK;
     public Transform Item;
 
-    public static bool ResetSign = false;
-
     public static List<int> TempTypeList = new List<int>();
     public static List<int> TempValueList = new List<int>();
     public static List<Lottery> TempLotteryList = new List<Lottery>();
 
     public static List<int> TypeList = new List<int>();
     public static List<float> RateList = new List<float>();
+    public static List<List<int>> LeftBorderIDList = new List<List<int>>();
+    public static List<List<int>> RightBorderIDList = new List<List<int>>();
     public static List<Vector3> PosList = new List<Vector3>();
-    public static List<List<int>> LeftBorderDList = new List<List<int>>();
-    public static List<List<int>> RightBorderDList = new List<List<int>>();
+
+    public static bool ResetSignRound = false;
 
     #endregion
 
-    public static void Configure(List<XmlAttributeCollection> attributeList)
+    public static void Init(List<XmlAttributeCollection> attributeList)
     {
         PosList.Add(ResourceManager.Get(ObjectLabel.Bc_LotteryItem1).position);
         PosList.Add(ResourceManager.Get(ObjectLabel.Bc_LotteryItem2).position);
@@ -291,12 +294,12 @@ public class Lottery
 
             for (int j = 0; j < leftBorderStrList.Count; j++)
             {
-                leftBorderList.Add((int)Auxiliary.FmlParse(leftBorderStrList[j], "l", (Manager.Level+1).ToString()));
-                rightBorderList.Add((int)Auxiliary.FmlParse(rightBorderStrList[j], "l", (Manager.Level+1).ToString()));
+                leftBorderList.Add((int)Auxiliary.FmlParse(leftBorderStrList[j], "l", (Manager.GardenLevel+1).ToString()));
+                rightBorderList.Add((int)Auxiliary.FmlParse(rightBorderStrList[j], "l", (Manager.GardenLevel+1).ToString()));
             }
 
-            LeftBorderDList.Add(leftBorderList);
-            RightBorderDList.Add(rightBorderList);
+            LeftBorderIDList.Add(leftBorderList);
+            RightBorderIDList.Add(rightBorderList);
         }
     }
 
@@ -306,7 +309,7 @@ public class Lottery
 
         lottery.Type = type;
 
-        lottery.Value = Random.Range(LeftBorderDList[0][0], RightBorderDList[0][0] + 1);
+        lottery.Value = Random.Range(LeftBorderIDList[0][0], RightBorderIDList[0][0] + 1);
 
         if (lottery.Type == LotteryType.Flower.GetHashCode())
         {
@@ -314,9 +317,9 @@ public class Lottery
 
             List<int> flowerIDs = new List<int>();
 
-            for (int j = 0; j < LeftBorderDList[type - 1].Count; j++)
+            for (int j = 0; j < LeftBorderIDList[type - 1].Count; j++)
             {
-                for (int k = LeftBorderDList[type - 1][j]; k < RightBorderDList[type - 1][j] + 1; k++)
+                for (int k = LeftBorderIDList[type - 1][j]; k < RightBorderIDList[type - 1][j] + 1; k++)
                 {
                     if (!TempValueList.Contains(k))
                     {
@@ -325,7 +328,7 @@ public class Lottery
                 }
             }
 
-            lottery.Value = Award.SelectAwardFlowerID(flowerIDs);
+            lottery.Value = MinigameAward.SelectUnlockFlowerID(flowerIDs);
 
             TempValueList.Add(lottery.Value);
 
@@ -337,11 +340,11 @@ public class Lottery
 
             bool allBought = true;
 
-            for (int j = 0; j < LeftBorderDList[type - 1].Count; j++)
+            for (int j = 0; j < LeftBorderIDList[type - 1].Count; j++)
             {
-                for (int k = LeftBorderDList[type - 1][j]; k < RightBorderDList[type - 1][j] + 1; k++)
+                for (int k = LeftBorderIDList[type - 1][j]; k < RightBorderIDList[type - 1][j] + 1; k++)
                 {
-                    if (!PlayerManager.CloseItemDic[k].Possess && !TempValueList.Contains(k))
+                    if (!PlayerManager.CloseItemDictionary[k].IsBought && !TempValueList.Contains(k))
                     {
                         allBought = false;
 
@@ -353,13 +356,13 @@ public class Lottery
 
             if (allBought)
             {
-                int index = Random.Range(0, LeftBorderDList[type - 1].Count);
+                int index = Random.Range(0, LeftBorderIDList[type - 1].Count);
 
-                lottery.Value = Random.Range(LeftBorderDList[type - 1][index], RightBorderDList[type - 1][index] + 1);
+                lottery.Value = Random.Range(LeftBorderIDList[type - 1][index], RightBorderIDList[type - 1][index] + 1);
 
-                CloseItem closeItem = PlayerManager.CloseItemDic[lottery.Value];
+                CloseItem closeItem = PlayerManager.CloseItemDictionary[lottery.Value];
 
-                lottery.Value = (int) closeItem.BuyAmt/5;
+                lottery.Value = (int) closeItem.BuyCost/5;
 
                 if (closeItem.BuyCurrent == Current.Coin)
                 {
@@ -381,10 +384,10 @@ public class Lottery
                         throw new Exception();
                     }
 
-                    int index = Random.Range(0, LeftBorderDList[type - 1].Count);
+                    int index = Random.Range(0, LeftBorderIDList[type - 1].Count);
 
-                    lottery.Value = Random.Range(LeftBorderDList[type - 1][index], RightBorderDList[type - 1][index] + 1);
-                } while (PlayerManager.CloseItemDic[lottery.Value].Possess || TempValueList.Contains(lottery.Value));
+                    lottery.Value = Random.Range(LeftBorderIDList[type - 1][index], RightBorderIDList[type - 1][index] + 1);
+                } while (PlayerManager.CloseItemDictionary[lottery.Value].IsBought || TempValueList.Contains(lottery.Value));
 
                 TempValueList.Add(lottery.Value);
             }
@@ -393,18 +396,18 @@ public class Lottery
         }
         else
         {
-            int index = Random.Range(0, LeftBorderDList[type - 1].Count);
+            int index = Random.Range(0, LeftBorderIDList[type - 1].Count);
 
-            lottery.Value = Random.Range(LeftBorderDList[type - 1][index], RightBorderDList[type - 1][index] + 1);
+            lottery.Value = Random.Range(LeftBorderIDList[type - 1][index], RightBorderIDList[type - 1][index] + 1);
         }
 
-        lottery.PosIndex = posIndex;
+        lottery.Index = posIndex;
         lottery.Item = lotteryItem;
         lottery.BK = lotteryItem.GetChild(0);
         lottery.Icon1 = lotteryItem.GetChild(1).GetChild(0).GetComponent<Image>();
         lottery.Icon2 = lotteryItem.GetChild(1).GetChild(1).GetComponent<Image>();
         lottery.Icon3 = lotteryItem.GetChild(1).GetChild(2).GetComponent<Image>();
-        lottery.Lab = lotteryItem.GetChild(1).GetChild(3).GetComponent<Text>();
+        lottery.DescriptionText = lotteryItem.GetChild(1).GetChild(3).GetComponent<Text>();
         lottery.Button = lotteryItem.GetChild(1).GetChild(4).GetComponent<Button>();
 
         lottery.BK.SetActive(false);
@@ -420,9 +423,9 @@ public class Lottery
 
             lottery.Icon2.transform.localPosition = new Vector3(0, 7.5f, 0);
 
-            lottery.Lab.SetActive(true);
+            lottery.DescriptionText.SetActive(true);
 
-            lottery.Lab.text = lottery.Value.ToString();
+            lottery.DescriptionText.text = lottery.Value.ToString();
         }
         else if (lottery.Type == LotteryType.Diamond.GetHashCode())
         {
@@ -435,32 +438,32 @@ public class Lottery
 
             lottery.Icon2.transform.localPosition = new Vector3(0, 7.5f, 0);
 
-            lottery.Lab.SetActive(true);
+            lottery.DescriptionText.SetActive(true);
 
-            lottery.Lab.text = lottery.Value.ToString();
+            lottery.DescriptionText.text = lottery.Value.ToString();
         }
         else if (lottery.Type == LotteryType.Flower.GetHashCode())
         {
             lottery.Icon1.SetActive(false);
             lottery.Icon3.SetActive(false);
 
-            lottery.Icon2.sprite = GardenManager.FlowerInfoDic[lottery.Value].Icon;
+            lottery.Icon2.sprite = GardenManager.FlowerInfoDictionary[lottery.Value].Icon;
 
             lottery.Icon2.Resize(true, 0.3125f, 0.3125f);
 
             lottery.Icon2.transform.localPosition = new Vector3();
 
-            lottery.Lab.SetActive(false);
+            lottery.DescriptionText.SetActive(false);
         }
         else if (lottery.Type == LotteryType.Close.GetHashCode())
         {
-            CloseItem closeItem = PlayerManager.CloseItemDic[lottery.Value];
+            CloseItem closeItem = PlayerManager.CloseItemDictionary[lottery.Value];
 
             float newSize = closeItem.PixelSize/closeItem.Sprites[0].rect.width;
 
-            closeItem.SetUpUI(newSize, new Vector2(), lottery.Icon1, lottery.Icon3, lottery.Icon2);
+            closeItem.SetupUI(newSize, new Vector2(), lottery.Icon1, lottery.Icon3, lottery.Icon2);
 
-            lottery.Lab.SetActive(false);
+            lottery.DescriptionText.SetActive(false);
         }
 
         lottery.Button.onClick = new Button.ButtonClickedEvent();
@@ -470,9 +473,9 @@ public class Lottery
         return lottery;
     }
 
-    public static void EnterAnimation(bool resetSign)
+    public static void PlayAnimation(bool resetSign)
     {
-        ResetSign = resetSign;
+        ResetSignRound = resetSign;
 
         ResourceManager.Get(ObjectLabel.Bc_Lottery).TweenForCG();
         ResourceManager.Get(ObjectLabel.Ba_Notice0).TweenBacCG();
@@ -576,7 +579,6 @@ public class Lottery
         AudioManager.PlayClip(AudioLabel.ClickButton);
     }
 
-
     public static void OnClick(int index)
     {
         AudioManager.PlayClip(AudioLabel.GetCurrent);
@@ -613,11 +615,12 @@ public class Lottery
             );
     }
 
+
     public void GetAward()
     {
-        if (ResetSign)
+        if (ResetSignRound)
         {
-            Sign.ResetSign();
+            SignItem.ResetSignRound();
         }
 
         BK.SetActive(true);
@@ -636,17 +639,17 @@ public class Lottery
         }
         else if (Type == LotteryType.Flower.GetHashCode())
         {
-            GardenManager.FlowerInfoDic[Value].Add();
+            GardenManager.FlowerInfoDictionary[Value].Add();
 
-            ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + GardenManager.FlowerInfoDic[Value].Name);
+            ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + GardenManager.FlowerInfoDictionary[Value].Name);
         }
         else if (Type == LotteryType.Close.GetHashCode())
         {
-            PlayerManager.CloseItemDic[Value].Unlock();
+            PlayerManager.CloseItemDictionary[Value].Unlock();
 
-            PlayerManager.BoughtCloseList.UniqueAdd(Value);
+            PlayerManager.BoughtCloseIDs.UniqueAdd(Value);
 
-            ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + PlayerManager.CloseItemDic[Value].Name);
+            ResourceManager.SetText(ObjectLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + PlayerManager.CloseItemDictionary[Value].Name);
         }
     }
 }
@@ -657,30 +660,30 @@ public class SignManager : Regist
 
     public static int SignIndex;
     public static int SignRound;
-    public static DateTime SignTime;
 
-    public static Dictionary<int, Sign> SignDic = new Dictionary<int, Sign>();
+    public static DateTime LastSignTime;
+    public static Dictionary<int, SignItem> SignItemDictionary = new Dictionary<int, SignItem>();
 
     #endregion
 
-    public static bool ShowOfflinePanel()
+    public static bool ShowPanels()
     {
         if (TutorialManager.NewplayerTutorial)
         {
             return false;
         }
 
-        if (ShowOfflineIncomReward())
+        if (ShowOfflineIncomPanel())
         {
             return true;
         }
 
-        if (ShowMailReward())
+        if (ShowMailRewardPanel())
         {
             return true;
         }
 
-        if (ShowSignReward())
+        if (ShowSignPanel())
         {
             return true;
         }
@@ -698,9 +701,9 @@ public class SignManager : Regist
         return false;
     }
 
-    public static bool ShowOfflineIncomReward()
+    public static bool ShowOfflineIncomPanel()
     {
-        if (Manager.OfflineLock)
+        if (Manager.OfflineFlag)
         {
             ResourceManager.Get(ObjectLabel.C_Group).TweenBacCG();
 
@@ -713,13 +716,13 @@ public class SignManager : Regist
         return false;
     }
 
-    public static bool ShowMailReward()
+    public static bool ShowMailRewardPanel()
     {
-        HttpManager.DecodeMailXml(HttpManager.MailXml);
+        HttpManager.DecodeMailXmlStr(HttpManager.MailXmlStr);
 
         if (HttpManager.MailRewardList.Count > 0)
         {
-                HttpManager.GetMailReward();
+                HttpManager.GetAllMailReward();
 
                 ResourceManager.Get(ObjectLabel.C_Group).TweenBacCG();
 
@@ -732,13 +735,13 @@ public class SignManager : Regist
         return false;
     }
 
-    public static bool ShowSignReward()
+    public static bool ShowSignPanel()
     {
-        if (ConfigManager.GetBoolFormConfig(PlayerConfigLabel.QuitFlag) && HttpManager.Connect)
+        if (ConfigManager.GetBoolFormConfig(PlayerConfigLabel.QuitFlag) && HttpManager.IsConnect)
         {
-            int daySpan = HttpManager.Time.Day - SignTime.Day;
-            int yearSpan = HttpManager.Time.Year - SignTime.Year;
-            int monthSpan = HttpManager.Time.Month - SignTime.Month;
+            int daySpan = HttpManager.CurrentDateTime.Day - LastSignTime.Day;
+            int yearSpan = HttpManager.CurrentDateTime.Year - LastSignTime.Year;
+            int monthSpan = HttpManager.CurrentDateTime.Month - LastSignTime.Month;
 
             if (daySpan >= 1 || yearSpan >= 1 || monthSpan >= 1)
             {
@@ -752,13 +755,13 @@ public class SignManager : Regist
         return false;
     }
 
-    public static bool ShowNotification()
+    public static bool ShowAnnouncePanel()
     {
-        if (HttpManager.NotificationIndex > ConfigManager.GetIntFormConfig(PlayerConfigLabel.NotificationIndex) && HttpManager.NotificationReady)
+        if (HttpManager.AnnounceIndex > ConfigManager.GetIntFormConfig(PlayerConfigLabel.NotificationIndex) && HttpManager.IsAnnounceReady)
         {
             ResourceManager.Get(ObjectLabel.B_SignIn).TweenBacCG();
 
-            ConfigManager.SaveIntToConfig(PlayerConfigLabel.NotificationIndex, HttpManager.NotificationIndex);
+            ConfigManager.SaveIntToConfig(PlayerConfigLabel.NotificationIndex, HttpManager.AnnounceIndex);
 
             AnnounceManager.ShowAnnouncePanel();
 
@@ -771,9 +774,9 @@ public class SignManager : Regist
     }
 
 
-    public static void GetSignReward()
+    public static void GetSignAward()
     {
-        SignDic[SignIndex].Get();
+        SignItemDictionary[SignIndex].Get();
 
         Manager.SignAmt++;
     }
@@ -781,7 +784,7 @@ public class SignManager : Regist
 
     public override void SecondInit()
     {
-        SignTime = DateTime.Parse(ConfigManager.GetStringFormConfig(PlayerConfigLabel.SignTime));
+        LastSignTime = DateTime.Parse(ConfigManager.GetStringFormConfig(PlayerConfigLabel.SignTime));
 
         SignIndex = ConfigManager.GetIntFormConfig(PlayerConfigLabel.SignIndex);
         SignRound = ConfigManager.GetIntFormConfig(PlayerConfigLabel.SignRound);
@@ -794,15 +797,15 @@ public class SignManager : Regist
         {
             Transform tra = ResourceManager.Get(ResourceLabel.SignItem, Folder.UI, false, par, false, ObjType.SignItem);
 
-            SignDic.Add(i + 1, new Sign(i + 1, tra, attributeList[i]));
+            SignItemDictionary.Add(i + 1, new SignItem(i + 1, tra, attributeList[i]));
         }
 
         for (int i = 1; i < SignIndex; i++)
         {
-            SignDic[i].Mark.SetActive(true);
+            SignItemDictionary[i].Tick.SetActive(true);
         }
 
 
-        Lottery.Configure(ConfigManager.GetLotteryConfig());
+        Lottery.Init(ConfigManager.GetLotteryConfig());
     }
 }

Assets/Script/Manage/SocialManager.cs

@@ -15,53 +15,56 @@ public class SocialManager : Regist
 {
     #region Config
 
-    public static bool RankRecordFlag;
+    public static bool OpenRankPanelFlag;
 
-    public static int CommentRecordLastIndex;
-    public static int CommentRecordFirstIndex;
-    public static bool CommentRecordFlag;
-    public static Vector3 CommentRecordPosition;
+    public static int RecordCommentLastIndex;
+    public static int RecordCommentFirstIndex;
+    public static bool OpenCommentFlag;
+    public static Vector3 RecordCommentPosition;
 
     public static bool IsPlayer;
-    public static bool PullLock;
-    public static bool UpdateLock;
     public static bool IsPanelOpen;
+    public static bool PullCommentDataFlag;
+    public static bool UpdateCommentDataFlag;
 
-    public static int PlayerLastIndex = -1;
-    public static int VisiteeLastIndex = -1;
-    public static int PlayerFirstIndex;
-    public static int VisiteeFirstIndex;
-    public static int PlayerCommentPage;
-    public static int VisiteeCommentPage;
+    public static int PlayerLastDisplayIndex = -1;
+    public static int PlayerFirstDisplayIndex;
+    public static int VisiteeLastDisplayIndex = -1;
+    public static int VisiteeFirstDisplayIndex;
+    public static int CurrentPlayerCommentPage;
+    public static int CurrentVisiteeCommentPage;
 
     public static Text PraiseText;
-    public static Button PraiseBtn;
+    public static Button PraiseButton;
     public static DateTime CommentTime;
-    public static InputField InputField;
-    public static ScrollRectPlus ScrollRectPlus;
-
-    public static float RankTime = 5;
-    public static float RankTimer = 0;
-    public static float PraiseTime = 10;
-    public static float PraiseTimer = 5;
-    public static float CommentTimespan = 60;
-    public static float CommentTimer = 0;
+    public static InputField CommentInputField;
+    public static ScrollRectPlus CommentScrollRect;
+
+    public static float UpdateRankDataTime = 5;
+    public static float UpdateRankDataTimer = 0;
+    public static float UpdatePraiseDataTime = 10;
+    public static float UpdatePraiseDataTimer = 5;
+    public static float CommentTimeSpan = 30f;
     public static List<CommentData> PlayerCommentDatas = new List<CommentData>();
     public static List<CommentData> VisiteeCommentDatas = new List<CommentData>();
 
+    private static int CommentPanelMaxRevertAmt = 15;
+    private static int CommentPanelMaxChildAmt = 20;
+    private static float CommentItemHeight = 120;
+
     #endregion
 
     public void Update()
     {
-        if (!HttpManager.RankReady)
+        if (!HttpManager.IsRankDataReady)
         {
-            RankTimer += Time.deltaTime;
+            UpdateRankDataTimer += Time.deltaTime;
 
-            if (RankTimer >= RankTime)
+            if (UpdateRankDataTimer >= UpdateRankDataTime)
             {
-                RankTimer = 0;
+                UpdateRankDataTimer = 0;
 
-                HttpManager.RankRequest();
+                HttpManager.GetRankData();
             }
         }
 
@@ -70,24 +73,25 @@ public class SocialManager : Regist
             return;
         }
 
-        PraiseTimer += Time.deltaTime;
+        UpdatePraiseDataTimer += Time.deltaTime;
 
-        if (PraiseTimer >= PraiseTime)
+        if (UpdatePraiseDataTimer >= UpdatePraiseDataTime)
         {
-            PraiseTimer = 0;
+            UpdatePraiseDataTimer = 0;
 
             PraiseText.text = HttpManager.PraiseAmt.ToString();
         }
     }
 
+
     public override void FirstInit()
     {
         PraiseText = ResourceManager.Get<Text>(ObjectLabel.C_PraiseText);
-        PraiseBtn = ResourceManager.Get<Button>(ObjectLabel.C_Praise);
-        InputField = ResourceManager.Get<InputField>(ObjectLabel.Q_InputField);
-        ScrollRectPlus = ResourceManager.Get<ScrollRectPlus>(ObjectLabel.Q_ScrollRect);
+        PraiseButton = ResourceManager.Get<Button>(ObjectLabel.C_Praise);
+        CommentInputField = ResourceManager.Get<InputField>(ObjectLabel.Q_InputField);
+        CommentScrollRect = ResourceManager.Get<ScrollRectPlus>(ObjectLabel.Q_ScrollRect);
 
-        ScrollRectPlus.onValueChanged.AddListener(OnScroll);
+        CommentScrollRect.onValueChanged.AddListener(OnScroll);
     }
 
 
@@ -109,191 +113,128 @@ public class SocialManager : Regist
 
     public static void EnablePraise()
     {
-        PraiseBtn.image.color = Color.white;
-        PraiseBtn.interactable = true;
+        PraiseButton.image.color = Color.white;
+        PraiseButton.interactable = true;
     }
 
     public static void DisablePraise()
     {
-        PraiseBtn.image.color = Lib.Pink;
-        PraiseBtn.interactable = false;
+        PraiseButton.image.color = Lib.Pink;
+        PraiseButton.interactable = false;
     }
 
 
-    public static void InputCommentData(bool isPlayer, JsonData jsonData)
+    public static void Comment()
     {
-        Auxiliary.Instance.DelayCall
-        (
-            () =>
-            {
-                PullLock = false;
-            },
-            1
-        );
-
-        if (!jsonData.Inst_Object.ContainsKey("l"))
+        if (string.IsNullOrEmpty(CommentInputField.text))
         {
-            return;
-        }
+            Bubble.Show(Language.GetStr(LanguageLabel.UI__Lb_Send2));
 
-        if (jsonData["l"].Count == 0)
-        {
             return;
         }
 
-        if (isPlayer)
+        if ((DateTime.Now - CommentTime).TotalSeconds > CommentTimeSpan)
         {
-            PlayerCommentPage++;
+            CommentTime = DateTime.Now;
 
-            foreach (JsonData commentData in jsonData["l"])
-            {
-                PlayerCommentDatas.UniqueAdd(new CommentData(commentData));
-            }
+            string content = StringFilter.GetFilteredString(CommentInputField.text);
+
+            HttpManager.AddComment(HttpManager.SerialNumber, VisitManager.VisiteeSerialNumber, content, CommentType.Garden);
+
+            CommentInputField.text = "";
         }
         else
         {
-            VisiteeCommentPage++;
-
-            foreach (JsonData commentData in jsonData["l"])
-            {
-                VisiteeCommentDatas.UniqueAdd(new CommentData(commentData));
-            }
+            Bubble.Show(Language.GetStr(LanguageLabel.UI__Q_CommentTip));
         }
     }
 
-
-    private static int MaxChildAmt = 20;
-    private static float ItemHeight = 120;
-    public static void NextPage(bool isPlayer, bool isDownload)
+    public static void OpenCommentPanel()
     {
-        //Debug.Log("NextPage");
-        if (isPlayer)
-        {
-            int saveAmt = 0;
-            int updateAmt = Mathf.Min(15, PlayerCommentDatas.Count - PlayerLastIndex - 1);
-
-            for (int i = 0; i < updateAmt; i++)
-            {
-                if (ScrollRectPlus.content.childCount >= MaxChildAmt)
-                {
-                    saveAmt++;
-                    ResourceManager.Save(ScrollRectPlus.content.GetChild(0).gameObject);
-                    PlayerFirstIndex++;
-                }
-
-                PlayerLastIndex++;
-
-                CommentData commentData = PlayerCommentDatas[PlayerLastIndex];
-                ResourceManager.GetCommentItem(commentData.NickName, commentData.SerialNumber, commentData.Content);
-            }
-
-            int offset = isDownload ? 1 : 0;
-            float scaleFactor = isDownload ? ScrollRectPlus.GetComponent<Image>().canvas.scaleFactor : 1;
+        IsPlayer = !VisitManager.InVisit;
 
-            if (saveAmt > 0)
-            {
-                ScrollRectPlus.content.position += new Vector3(0, -(saveAmt - offset)*ItemHeight*scaleFactor, 0);
-                ScrollRectPlus.AddContentOffset(new Vector3(0, -(saveAmt - offset)* ItemHeight * scaleFactor, 0));
-            }
+        if (IsPlayer)
+        {
+            UpdateCommentPage(IsPlayer);
         }
         else
         {
-            int saveAmt = 0;
-            int updateAmt = Mathf.Min(15, VisiteeCommentDatas.Count - VisiteeLastIndex - 1);
-
-            for (int i = 0; i < updateAmt; i++)
+            if (string.IsNullOrEmpty(VisitManager.VisiteeSerialNumber))
             {
-                if (ScrollRectPlus.content.childCount >= MaxChildAmt)
-                {
-                    saveAmt++;
-                    ResourceManager.Save(ScrollRectPlus.content.GetChild(0).gameObject);
-                    VisiteeFirstIndex++;
-                }
-
-                VisiteeLastIndex++;
-
-                CommentData commentData = VisiteeCommentDatas[VisiteeLastIndex];
-                ResourceManager.GetCommentItem(commentData.NickName, commentData.SerialNumber, commentData.Content);
+                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__C_CannotComment));
+                return;
             }
-
-            int offset = isDownload ? 1 : 0;
-            float scaleFactor = isDownload ? ScrollRectPlus.GetComponent<Image>().canvas.scaleFactor : 1;
-
-            if (saveAmt > 0)
+            else
             {
-                ScrollRectPlus.content.position += new Vector3(0, -(saveAmt - offset)* ItemHeight * scaleFactor, 0);
-                ScrollRectPlus.AddContentOffset(new Vector3(0, -(saveAmt - offset)* ItemHeight * scaleFactor, 0));
+                UpdateCommentPage(IsPlayer);
             }
         }
+
+        IsPanelOpen = true;
+        ResourceManager.Get(ObjectLabel.Q_CommentBK).TweenForCG();
+
+        ResourceManager.SetActive(ObjectLabel.Q_InputBK, VisitManager.InVisit);
+    }
+
+    public static void CloseCommentPanel()
+    {
+        ResourceManager.Get(ObjectLabel.Q_CommentBK).TweenBacCG();
+        IsPanelOpen = false;
     }
 
-    private static int MaxRevertAmt = 15;
-    public static void PreviousPage(bool isPlayer)
+    public static void RecordCommentPanel()
     {
-        if (ScrollRectPlus.content.childCount == 0)
+        if (IsPlayer)
         {
-            return;
+            OpenCommentFlag = true;
+            RecordCommentLastIndex = PlayerLastDisplayIndex;
+            RecordCommentFirstIndex = PlayerFirstDisplayIndex;
+            RecordCommentPosition = CommentScrollRect.content.transform.position;
         }
+    }
 
-        //Debug.Log("PreviousPage");
-
-        if (isPlayer)
+    public static void RecoverCommentPanel()
+    {
+        if (OpenCommentFlag)
         {
-            if (PlayerCommentDatas.Count > MaxChildAmt && PlayerFirstIndex > 0)
-            {
-                int revertAmt = Mathf.Min(MaxRevertAmt, PlayerFirstIndex);
+            OpenCommentFlag = false;
 
-                for (int i = 0; i < revertAmt; i++)
-                {
-                    ResourceManager.Save(ScrollRectPlus.content.GetChild(ScrollRectPlus.content.childCount - 1));
-                    CommentData commentData = VisiteeCommentDatas[VisiteeLastIndex];
+            ClearCommentPanel();
 
-                    CommentItem commentItem = ResourceManager.GetCommentItem(commentData.NickName, commentData.SerialNumber, commentData.Content);
-                    commentItem.transform.SetAsFirstSibling();
+            PlayerLastDisplayIndex = -1;
+            PlayerFirstDisplayIndex = 0;
 
-                    PlayerLastIndex--;
-                    PlayerFirstIndex--;
-                }
+            int antiCrush = 0;
 
-                if (revertAmt > 0)
-                {
-                    ScrollRectPlus.content.position += new Vector3(0, revertAmt* ItemHeight, 0);
-                    ScrollRectPlus.AddContentOffset(new Vector3(0, revertAmt* ItemHeight, 0));
-                }
-            }
-        }
-        else
-        {
-            if (VisiteeCommentDatas.Count > MaxChildAmt && VisiteeFirstIndex > 0)
+            while (PlayerFirstDisplayIndex != RecordCommentFirstIndex || PlayerLastDisplayIndex != RecordCommentLastIndex)
             {
-                int revertAmt = Mathf.Min(MaxRevertAmt, VisiteeFirstIndex);
-
-                for (int i = 0; i < revertAmt; i++)
+                if (antiCrush > 10000)
                 {
-                    ResourceManager.Save(ScrollRectPlus.content.GetChild(ScrollRectPlus.content.childCount - 1));
-                    CommentData commentData = VisiteeCommentDatas[VisiteeLastIndex];
-
-                    CommentItem commentItem = ResourceManager.GetCommentItem(commentData.NickName, commentData.SerialNumber, commentData.Content);
-                    commentItem.transform.SetAsFirstSibling();
-
-                    VisiteeLastIndex--;
-                    VisiteeFirstIndex--;
+                    throw new Exception("Crush");
                 }
 
-                if (revertAmt > 0)
+                if (CommentScrollRect.content.childCount >= CommentPanelMaxChildAmt)
                 {
-                    ScrollRectPlus.content.position += new Vector3(0, revertAmt* ItemHeight, 0);
-                    ScrollRectPlus.AddContentOffset(new Vector3(0, revertAmt* ItemHeight, 0));
+                    ResourceManager.Save(CommentScrollRect.content.GetChild(0).gameObject);
+                    PlayerFirstDisplayIndex++;
                 }
+
+                PlayerLastDisplayIndex++;
+                CommentData commentData = PlayerCommentDatas[PlayerLastDisplayIndex];
+                ResourceManager.GetCommentItem(commentData.NickName, commentData.SerialNumber, commentData.Content);
             }
+
+            CommentScrollRect.content.transform.position = RecordCommentPosition;
+
+            OpenCommentPanel();
         }
     }
 
 
-    public static void PullPage(bool isPlayer)
+    public static void PullCommentPage(bool isPlayer)
     {
-        PullLock = true;
-        UpdateLock = false;
+        PullCommentDataFlag = true;
+        UpdateCommentDataFlag = false;
         //Debug.Log("PullPage");
 
         if (isPlayer)
@@ -301,18 +242,18 @@ public class SocialManager : Regist
             HttpManager.GetComment
             (
                 HttpManager.SerialNumber,
-                (PlayerCommentPage + 1).ToString(),
+                (CurrentPlayerCommentPage + 1).ToString(),
                 CommentType.Garden,
                 data =>
                 {
-                    if (!UpdateLock)
+                    if (!UpdateCommentDataFlag)
                     {
-                        InputCommentData(IsPlayer, data);
-                        NextPage(IsPlayer, true);
+                        ReceiveCommentDatas(IsPlayer, data);
+                        NextCommentPage(IsPlayer, true);
                     }
                     else
                     {
-                        PullLock = false;
+                        PullCommentDataFlag = false;
                     }
                 }
             );
@@ -322,41 +263,29 @@ public class SocialManager : Regist
             HttpManager.GetComment
             (
                 HttpManager.SerialNumber,
-                (VisiteeCommentPage + 1).ToString(),
+                (CurrentVisiteeCommentPage + 1).ToString(),
                 CommentType.Garden,
                 data =>
                 {
-                    if (!UpdateLock)
+                    if (!UpdateCommentDataFlag)
                     {
-                        InputCommentData(IsPlayer, data);
-                        NextPage(IsPlayer, true);
+                        ReceiveCommentDatas(IsPlayer, data);
+                        NextCommentPage(IsPlayer, true);
                     }
                     else
                     {
-                        PullLock = false;
+                        PullCommentDataFlag = false;
                     }
                 }
             );
         }
     }
 
-    public static void ClearComment()
+    public static void UpdateCommentPage(bool isPlayer)
     {
-        int childAmt = ScrollRectPlus.content.childCount;
+        UpdateCommentDataFlag = true;
 
-        for (int i = 0; i < childAmt; i++)
-        {
-            ResourceManager.Save(ScrollRectPlus.content.GetChild(0));
-        }
-
-        ScrollRectPlus.verticalNormalizedPosition = 1;
-    }
-
-    public static void UpdatePage(bool isPlayer)
-    {
-        UpdateLock = true;
-
-        ClearComment();
+        ClearCommentPanel();
 
         ResourceManager.Get(ObjectLabel.Q_Tip).TweenForCG();
         LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Q_Tip), Language.GetStr(LanguageLabel.UI__Loading));
@@ -365,9 +294,9 @@ public class SocialManager : Regist
         {
             //Debug.Log("UpdatePlayer");
 
-            PlayerFirstIndex = 0;
-            PlayerLastIndex = -1;
-            PlayerCommentPage = 0;
+            PlayerFirstDisplayIndex = 0;
+            PlayerLastDisplayIndex = -1;
+            CurrentPlayerCommentPage = 0;
             PlayerCommentDatas = new List<CommentData>();
 
             HttpManager.GetComment
@@ -382,8 +311,8 @@ public class SocialManager : Regist
                         DelayCall.Call(0.5f, () => ResourceManager.Get(ObjectLabel.Q_Tip).TweenBacCG());
                         LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Q_Tip), Language.GetStr(LanguageLabel.UI__LoadSucceed));
 
-                        InputCommentData(true, data);
-                        NextPage(true, true);
+                        ReceiveCommentDatas(true, data);
+                        NextCommentPage(true, true);
 
                         ResourceManager.Get<CanvasGroup>(ObjectLabel.Q_CommentBK).interactable = false;
                         DelayCall.Call(1, () => ResourceManager.Get<CanvasGroup>(ObjectLabel.Q_CommentBK).interactable = true);
@@ -395,9 +324,9 @@ public class SocialManager : Regist
         {
             //Debug.Log("UpdateVisitee");
 
-            VisiteeFirstIndex = 0;
-            VisiteeLastIndex = -1;
-            VisiteeCommentPage = 0;
+            VisiteeFirstDisplayIndex = 0;
+            VisiteeLastDisplayIndex = -1;
+            CurrentVisiteeCommentPage = 0;
             VisiteeCommentDatas = new List<CommentData>();
 
             HttpManager.GetComment
@@ -412,8 +341,8 @@ public class SocialManager : Regist
                         DelayCall.Call(0.5f, () => ResourceManager.Get(ObjectLabel.Q_Tip).TweenBacCG());
                         LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Q_Tip), Language.GetStr(LanguageLabel.UI__LoadSucceed));
 
-                        InputCommentData(false, data);
-                        NextPage(false, true);
+                        ReceiveCommentDatas(false, data);
+                        NextCommentPage(false, true);
 
                         ResourceManager.Get<CanvasGroup>(ObjectLabel.Q_CommentBK).interactable = false;
                         DelayCall.Call(1, () => ResourceManager.Get<CanvasGroup>(ObjectLabel.Q_CommentBK).interactable = true);
@@ -423,197 +352,265 @@ public class SocialManager : Regist
         }
     }
 
-
-    public static void OnScroll(Vector2 position)
+    public static void ReceiveCommentDatas(bool isPlayer, JsonData jsonData)
     {
-        if (PullLock)
+        Auxiliary.Instance.DelayCall
+        (
+            () =>
+            {
+                PullCommentDataFlag = false;
+            },
+            1
+        );
+
+        if (!jsonData.Inst_Object.ContainsKey("l"))
         {
             return;
         }
 
-        if (ScrollRectPlus.content.childCount == 0)
+        if (jsonData["l"].Count == 0)
         {
             return;
         }
 
-        if (position.y >= 1)
+        if (isPlayer)
         {
-            PreviousPage(IsPlayer);
-        }
+            CurrentPlayerCommentPage++;
 
-        if (position.y <= 0)
-        {
-            if (IsPlayer)
+            foreach (JsonData commentData in jsonData["l"])
             {
-                if (PlayerLastIndex == PlayerCommentDatas.Count - 1)
-                {
-                    PullPage(true);
-                }
-                else if (PlayerLastIndex < PlayerCommentDatas.Count - 1)
-                {
-                    NextPage(true, false);
-                }
+                PlayerCommentDatas.UniqueAdd(new CommentData(commentData));
             }
-            else
+        }
+        else
+        {
+            CurrentVisiteeCommentPage++;
+
+            foreach (JsonData commentData in jsonData["l"])
             {
-                if (VisiteeLastIndex == VisiteeCommentDatas.Count - 1)
-                {
-                    PullPage(false);
-                }
-                else if (VisiteeLastIndex < VisiteeCommentDatas.Count - 1)
-                {
-                    NextPage(false, false);
-                }
+                VisiteeCommentDatas.UniqueAdd(new CommentData(commentData));
             }
         }
     }
 
-
-    public static void OpenRankPanel()
+    public static void NextCommentPage(bool isPlayer, bool isDownload)
     {
-        AudioManager.PlayClip(AudioLabel.Bubble);
+        //Debug.Log("NextPage");
+        if (isPlayer)
+        {
+            int saveAmt = 0;
+            int updateAmt = Mathf.Min(15, PlayerCommentDatas.Count - PlayerLastDisplayIndex - 1);
 
-        ResourceManager.Get(ObjectLabel.S_RankBK).TweenForCG();
-    }
+            for (int i = 0; i < updateAmt; i++)
+            {
+                if (CommentScrollRect.content.childCount >= CommentPanelMaxChildAmt)
+                {
+                    saveAmt++;
+                    ResourceManager.Save(CommentScrollRect.content.GetChild(0).gameObject);
+                    PlayerFirstDisplayIndex++;
+                }
 
-    public static void CloseRankPanel()
-    {
-        AudioManager.PlayClip(AudioLabel.ClickButton);
+                PlayerLastDisplayIndex++;
 
-        ResourceManager.Get(ObjectLabel.S_RankBK).TweenBacCG();
-    }
+                CommentData commentData = PlayerCommentDatas[PlayerLastDisplayIndex];
+                ResourceManager.GetCommentItem(commentData.NickName, commentData.SerialNumber, commentData.Content);
+            }
 
-    public static void RecordRankPanel()
-    {
-        RankRecordFlag = true;
-    }
+            int offset = isDownload ? 1 : 0;
+            float scaleFactor = isDownload ? CommentScrollRect.GetComponent<Image>().canvas.scaleFactor : 1;
 
-    public static void RecoverRankPanel()
-    {
-        if (RankRecordFlag)
+            if (saveAmt > 0)
+            {
+                CommentScrollRect.content.position += new Vector3(0, -(saveAmt - offset)*CommentItemHeight*scaleFactor, 0);
+                CommentScrollRect.AddContentOffset(new Vector3(0, -(saveAmt - offset)* CommentItemHeight * scaleFactor, 0));
+            }
+        }
+        else
         {
-            RankRecordFlag = false;
+            int saveAmt = 0;
+            int updateAmt = Mathf.Min(15, VisiteeCommentDatas.Count - VisiteeLastDisplayIndex - 1);
 
-            OpenRankPanel();
-        }
-    }
+            for (int i = 0; i < updateAmt; i++)
+            {
+                if (CommentScrollRect.content.childCount >= CommentPanelMaxChildAmt)
+                {
+                    saveAmt++;
+                    ResourceManager.Save(CommentScrollRect.content.GetChild(0).gameObject);
+                    VisiteeFirstDisplayIndex++;
+                }
 
-    public static void InitializeRankPanel()
-    {
-        if (Initializer.Complete && HttpManager.RankReady)
-        {
-            for (int i = 0; i < HttpManager.RankDatas.Count; i++)
+                VisiteeLastDisplayIndex++;
+
+                CommentData commentData = VisiteeCommentDatas[VisiteeLastDisplayIndex];
+                ResourceManager.GetCommentItem(commentData.NickName, commentData.SerialNumber, commentData.Content);
+            }
+
+            int offset = isDownload ? 1 : 0;
+            float scaleFactor = isDownload ? CommentScrollRect.GetComponent<Image>().canvas.scaleFactor : 1;
+
+            if (saveAmt > 0)
             {
-                ResourceManager.GetRanktem((i + 1).ToString(), HttpManager.RankDatas[i][1].ToString(), HttpManager.RankDatas[i][0].ToString());
+                CommentScrollRect.content.position += new Vector3(0, -(saveAmt - offset)* CommentItemHeight * scaleFactor, 0);
+                CommentScrollRect.AddContentOffset(new Vector3(0, -(saveAmt - offset)* CommentItemHeight * scaleFactor, 0));
             }
         }
     }
 
-
-    private static float CommentUpdateTime = 30f;
-    public static void Comment()
+    public static void PreviousCommentPage(bool isPlayer)
     {
-        if (string.IsNullOrEmpty(InputField.text))
+        if (CommentScrollRect.content.childCount == 0)
         {
-            Bubble.Show(Language.GetStr(LanguageLabel.UI__Lb_Send2));
-
             return;
         }
 
-        if ((DateTime.Now - CommentTime).TotalSeconds > CommentUpdateTime)
+        //Debug.Log("PreviousPage");
+
+        if (isPlayer)
         {
-            CommentTime = DateTime.Now;
+            if (PlayerCommentDatas.Count > CommentPanelMaxChildAmt && PlayerFirstDisplayIndex > 0)
+            {
+                int revertAmt = Mathf.Min(CommentPanelMaxRevertAmt, PlayerFirstDisplayIndex);
 
-            string content = StringFilter.GetFilteredString(InputField.text);
+                for (int i = 0; i < revertAmt; i++)
+                {
+                    ResourceManager.Save(CommentScrollRect.content.GetChild(CommentScrollRect.content.childCount - 1));
+                    CommentData commentData = VisiteeCommentDatas[VisiteeLastDisplayIndex];
 
-            HttpManager.AddComment(HttpManager.SerialNumber, VisitManager.VisiteeSerialNumber, content, CommentType.Garden);
+                    CommentItem commentItem = ResourceManager.GetCommentItem(commentData.NickName, commentData.SerialNumber, commentData.Content);
+                    commentItem.transform.SetAsFirstSibling();
+
+                    PlayerLastDisplayIndex--;
+                    PlayerFirstDisplayIndex--;
+                }
 
-            InputField.text = "";
+                if (revertAmt > 0)
+                {
+                    CommentScrollRect.content.position += new Vector3(0, revertAmt* CommentItemHeight, 0);
+                    CommentScrollRect.AddContentOffset(new Vector3(0, revertAmt* CommentItemHeight, 0));
+                }
+            }
         }
         else
         {
-            Bubble.Show(Language.GetStr(LanguageLabel.UI__Q_CommentTip));
+            if (VisiteeCommentDatas.Count > CommentPanelMaxChildAmt && VisiteeFirstDisplayIndex > 0)
+            {
+                int revertAmt = Mathf.Min(CommentPanelMaxRevertAmt, VisiteeFirstDisplayIndex);
+
+                for (int i = 0; i < revertAmt; i++)
+                {
+                    ResourceManager.Save(CommentScrollRect.content.GetChild(CommentScrollRect.content.childCount - 1));
+                    CommentData commentData = VisiteeCommentDatas[VisiteeLastDisplayIndex];
+
+                    CommentItem commentItem = ResourceManager.GetCommentItem(commentData.NickName, commentData.SerialNumber, commentData.Content);
+                    commentItem.transform.SetAsFirstSibling();
+
+                    VisiteeLastDisplayIndex--;
+                    VisiteeFirstDisplayIndex--;
+                }
+
+                if (revertAmt > 0)
+                {
+                    CommentScrollRect.content.position += new Vector3(0, revertAmt* CommentItemHeight, 0);
+                    CommentScrollRect.AddContentOffset(new Vector3(0, revertAmt* CommentItemHeight, 0));
+                }
+            }
         }
     }
 
-    public static void OpenCommentPanel()
+    public static void ClearCommentPanel()
     {
-        IsPlayer = !VisitManager.InVisit;
+        int childAmt = CommentScrollRect.content.childCount;
 
-        if (IsPlayer)
+        for (int i = 0; i < childAmt; i++)
         {
-            UpdatePage(IsPlayer);
+            ResourceManager.Save(CommentScrollRect.content.GetChild(0));
         }
-        else
+
+        CommentScrollRect.verticalNormalizedPosition = 1;
+    }
+
+    public static void OnScroll(Vector2 position)
+    {
+        if (PullCommentDataFlag)
         {
-            if (string.IsNullOrEmpty(VisitManager.VisiteeSerialNumber))
+            return;
+        }
+
+        if (CommentScrollRect.content.childCount == 0)
+        {
+            return;
+        }
+
+        if (position.y >= 1)
+        {
+            PreviousCommentPage(IsPlayer);
+        }
+
+        if (position.y <= 0)
+        {
+            if (IsPlayer)
             {
-                Bubble.Show(null, Language.GetStr(LanguageLabel.UI__C_CannotComment));
-                return;
+                if (PlayerLastDisplayIndex == PlayerCommentDatas.Count - 1)
+                {
+                    PullCommentPage(true);
+                }
+                else if (PlayerLastDisplayIndex < PlayerCommentDatas.Count - 1)
+                {
+                    NextCommentPage(true, false);
+                }
             }
             else
             {
-                UpdatePage(IsPlayer);
+                if (VisiteeLastDisplayIndex == VisiteeCommentDatas.Count - 1)
+                {
+                    PullCommentPage(false);
+                }
+                else if (VisiteeLastDisplayIndex < VisiteeCommentDatas.Count - 1)
+                {
+                    NextCommentPage(false, false);
+                }
             }
         }
+    }
 
-        IsPanelOpen = true;
-        ResourceManager.Get(ObjectLabel.Q_CommentBK).TweenForCG();
 
-        ResourceManager.SetActive(ObjectLabel.Q_InputBK, VisitManager.InVisit);
+    public static void OpenRankPanel()
+    {
+        AudioManager.PlayClip(AudioLabel.Bubble);
+
+        ResourceManager.Get(ObjectLabel.S_RankBK).TweenForCG();
     }
 
-    public static void CloseCommentPanel()
+    public static void CloseRankPanel()
     {
-        ResourceManager.Get(ObjectLabel.Q_CommentBK).TweenBacCG();
-        IsPanelOpen = false;
+        AudioManager.PlayClip(AudioLabel.ClickButton);
+
+        ResourceManager.Get(ObjectLabel.S_RankBK).TweenBacCG();
     }
 
-    public static void RecordCommentPanel()
+    public static void RecordRankPanel()
     {
-        if (IsPlayer)
-        {
-            CommentRecordFlag = true;
-            CommentRecordLastIndex = PlayerLastIndex;
-            CommentRecordFirstIndex = PlayerFirstIndex;
-            CommentRecordPosition = ScrollRectPlus.content.transform.position;
-        }
+        OpenRankPanelFlag = true;
     }
 
-    public static void RecoverCommentPanel()
+    public static void RecoverRankPanel()
     {
-        if (CommentRecordFlag)
+        if (OpenRankPanelFlag)
         {
-            CommentRecordFlag = false;
-
-            ClearComment();
-
-            PlayerLastIndex = -1;
-            PlayerFirstIndex = 0;
+            OpenRankPanelFlag = false;
 
-            int antiCrush = 0;
+            OpenRankPanel();
+        }
+    }
 
-            while (PlayerFirstIndex != CommentRecordFirstIndex || PlayerLastIndex != CommentRecordLastIndex)
+    public static void InitRankPanel()
+    {
+        if (Initializer.Inited && HttpManager.IsRankDataReady)
+        {
+            for (int i = 0; i < HttpManager.RankDatas.Count; i++)
             {
-                if (antiCrush > 10000)
-                {
-                    throw new Exception("Crush");
-                }
-
-                if (ScrollRectPlus.content.childCount >= MaxChildAmt)
-                {
-                    ResourceManager.Save(ScrollRectPlus.content.GetChild(0).gameObject);
-                    PlayerFirstIndex++;
-                }
-
-                PlayerLastIndex++;
-                CommentData commentData = PlayerCommentDatas[PlayerLastIndex];
-                ResourceManager.GetCommentItem(commentData.NickName, commentData.SerialNumber, commentData.Content);
+                ResourceManager.GetRanktem((i + 1).ToString(), HttpManager.RankDatas[i][1].ToString(), HttpManager.RankDatas[i][0].ToString());
             }
-
-            ScrollRectPlus.content.transform.position = CommentRecordPosition;
-
-            OpenCommentPanel();
         }
     }
 }

Assets/Script/Manage/TutorialManager.cs

@@ -13,7 +13,7 @@ public class TutorialManager : Regist
     {
         get
         {
-            if (PayExempt_)
+            if (payExempt)
             {
                 return true;
             }
@@ -31,13 +31,16 @@ public class TutorialManager : Regist
                 }
             }
         }
-        set { PayExempt_ = value; }
+        set { payExempt = value; }
     }
+    public static bool payExempt;
+    public static int PayExemptAmt;
+
     public static bool ConnectExempt
     {
         get
         {
-            if (ConnectExempt_)
+            if (connectExempt)
             {
                 return true;
             }
@@ -55,13 +58,9 @@ public class TutorialManager : Regist
                 }
             }
         }
-        set { ConnectExempt_ = value; }
+        set { connectExempt = value; }
     }
-
-    public static bool PayExempt_;
-    public static bool ConnectExempt_;
-
-    public static int PayExemptAmt;
+    public static bool connectExempt;
     public static int ConnectExemptAmt;
 
     public static int MemoryMinigameTutorialLevel = 18;
@@ -73,22 +72,26 @@ public class TutorialManager : Regist
     public static int MinFlowerForFindGame = 2;
 
     public static bool NewplayerTutorial;
+    public static int NewplayerTutorialIndex;
+
     public static bool MemoryMinigameTutorial;
-    public static bool VisitTutorial;
-    public static bool DressroomTutorial;
-    public static bool FindMinigameTutorial;
-    public static bool PlazaRoomTutorial;
     public static bool memoryMinigameTutorial;
-    public static bool visitTutorial;
-    public static bool dressroomTutorial;
-    public static bool findMinigameTutorial;
-    public static bool plazaRoomTutorial;
-
-    public static int NewplayerTutorialIndex;
     public static int MemoryMinigameTutorialIndex;
+
+    public static bool VisitTutorial;
+    public static bool visitTutorial;
     public static int VisitTutorialIndex;
+
+    public static bool DressroomTutorial;
+    public static bool dressroomTutorial;
     public static int DressroomTutorialIndex;
+
+    public static bool FindMinigameTutorial;
+    public static bool findMinigameTutorial;
     public static int FindMinigameTutorialIndex;
+
+    public static bool PlazaRoomTutorial;
+    public static bool plazaRoomTutorial;
     public static int PlazaRoomTutorialIndex;
 
     #endregion
@@ -285,12 +288,12 @@ public class TutorialManager : Regist
     {
         NewplayerTutorialIndex = 1;
 
-        PlayerManager.PlayerPink.CreateTweenScale(0.9f, 1f, true, true, Curve.EaseOutQuad);
-        PlayerManager.PlayerBlond.CreateTweenScale(0.9f, 1f, true, true, Curve.EaseOutQuad);
-        PlayerManager.PlayerBrown.CreateTweenScale(0.9f, 1f, true, true, Curve.EaseOutQuad);
+        PlayerManager.DefaultPinkPlayer.CreateTweenScale(0.9f, 1f, true, true, Curve.EaseOutQuad);
+        PlayerManager.DefaultBlondPlayer.CreateTweenScale(0.9f, 1f, true, true, Curve.EaseOutQuad);
+        PlayerManager.DefaultBrownPlayer.CreateTweenScale(0.9f, 1f, true, true, Curve.EaseOutQuad);
 
         ResourceManager.Get(TutorialLabel.PlayerBk2).TweenForScale();
-        PlayerManager.PlayerBlond.TweenForScale();
+        PlayerManager.DefaultBlondPlayer.TweenForScale();
 
         ResourceManager.SetActive(TutorialLabel.PlayerBk1, true);
         ResourceManager.SetActive(TutorialLabel.PlayerBk2, true);
@@ -306,102 +309,102 @@ public class TutorialManager : Regist
             ObjectLabel.N_Confirm,
             () =>
             {
-                if (PlayerManager.SeleTra == PlayerManager.PlayerPink)
+                if (PlayerManager.SelectedPlayer == PlayerManager.DefaultPinkPlayer)
                 {
-                    PlayerManager.DressData.Add("脑壳3");
-                    PlayerManager.DressData.Add("裙子3");
-                    PlayerManager.DressData.Add("鞋子3");
-                    PlayerManager.DressData.Add("头饰品3");
-                    PlayerManager.DressData.Add("上衣3");
-                    PlayerManager.DressData.Add("眼睛3");
-                    PlayerManager.DressData.Add("嘴巴3");
-                    PlayerManager.DressData.Add("Empty");
-                    PlayerManager.DressData.Add("Empty");
-                    PlayerManager.DressData.Add("短袖1左");
-                    PlayerManager.DressData.Add("Empty");
-                    PlayerManager.DressData.Add("短袖1右");
+                    PlayerManager.DressDatas.Add("脑壳3");
+                    PlayerManager.DressDatas.Add("裙子3");
+                    PlayerManager.DressDatas.Add("鞋子3");
+                    PlayerManager.DressDatas.Add("头饰品3");
+                    PlayerManager.DressDatas.Add("上衣3");
+                    PlayerManager.DressDatas.Add("眼睛3");
+                    PlayerManager.DressDatas.Add("嘴巴3");
+                    PlayerManager.DressDatas.Add("Empty");
+                    PlayerManager.DressDatas.Add("Empty");
+                    PlayerManager.DressDatas.Add("短袖1左");
+                    PlayerManager.DressDatas.Add("Empty");
+                    PlayerManager.DressDatas.Add("短袖1右");
                 }
-                else if (PlayerManager.SeleTra == PlayerManager.PlayerBlond)
+                else if (PlayerManager.SelectedPlayer == PlayerManager.DefaultBlondPlayer)
                 {
-                    PlayerManager.DressData.Add("脑壳1");
-                    PlayerManager.DressData.Add("裙子1");
-                    PlayerManager.DressData.Add("鞋子1");
-                    PlayerManager.DressData.Add("头饰品1");
-                    PlayerManager.DressData.Add("上衣1");
-                    PlayerManager.DressData.Add("眼睛1");
-                    PlayerManager.DressData.Add("嘴巴1");
-                    PlayerManager.DressData.Add("Empty");
-                    PlayerManager.DressData.Add("Empty");
-                    PlayerManager.DressData.Add("短袖2左");
-                    PlayerManager.DressData.Add("Empty");
-                    PlayerManager.DressData.Add("短袖2右");
+                    PlayerManager.DressDatas.Add("脑壳1");
+                    PlayerManager.DressDatas.Add("裙子1");
+                    PlayerManager.DressDatas.Add("鞋子1");
+                    PlayerManager.DressDatas.Add("头饰品1");
+                    PlayerManager.DressDatas.Add("上衣1");
+                    PlayerManager.DressDatas.Add("眼睛1");
+                    PlayerManager.DressDatas.Add("嘴巴1");
+                    PlayerManager.DressDatas.Add("Empty");
+                    PlayerManager.DressDatas.Add("Empty");
+                    PlayerManager.DressDatas.Add("短袖2左");
+                    PlayerManager.DressDatas.Add("Empty");
+                    PlayerManager.DressDatas.Add("短袖2右");
                 }
-                else if (PlayerManager.SeleTra == PlayerManager.PlayerBrown)
+                else if (PlayerManager.SelectedPlayer == PlayerManager.DefaultBrownPlayer)
                 {
-                    PlayerManager.DressData.Add("脑壳2");
-                    PlayerManager.DressData.Add("裙子2");
-                    PlayerManager.DressData.Add("鞋子2");
-                    PlayerManager.DressData.Add("头饰品2");
-                    PlayerManager.DressData.Add("上衣2");
-                    PlayerManager.DressData.Add("眼睛2");
-                    PlayerManager.DressData.Add("嘴巴2");
-                    PlayerManager.DressData.Add("Empty");
-                    PlayerManager.DressData.Add("Empty");
-                    PlayerManager.DressData.Add("短袖2左");
-                    PlayerManager.DressData.Add("Empty");
-                    PlayerManager.DressData.Add("短袖2右");
+                    PlayerManager.DressDatas.Add("脑壳2");
+                    PlayerManager.DressDatas.Add("裙子2");
+                    PlayerManager.DressDatas.Add("鞋子2");
+                    PlayerManager.DressDatas.Add("头饰品2");
+                    PlayerManager.DressDatas.Add("上衣2");
+                    PlayerManager.DressDatas.Add("眼睛2");
+                    PlayerManager.DressDatas.Add("嘴巴2");
+                    PlayerManager.DressDatas.Add("Empty");
+                    PlayerManager.DressDatas.Add("Empty");
+                    PlayerManager.DressDatas.Add("短袖2左");
+                    PlayerManager.DressDatas.Add("Empty");
+                    PlayerManager.DressDatas.Add("短袖2右");
                 }
 
-                foreach (var str in PlayerManager.DressData)
+                foreach (var str in PlayerManager.DressDatas)
                 {
-                    if (!PlayerManager.CloseIDDic.ContainsKey(str))
+                    if (!PlayerManager.CloseIDDictionary.ContainsKey(str))
                     {
                         continue;
                     }
 
-                    int id = PlayerManager.CloseIDDic[str];
+                    int id = PlayerManager.CloseIDDictionary[str];
 
-                    PlayerManager.CloseItemDic[id].Unlock();
+                    PlayerManager.CloseItemDictionary[id].Unlock();
 
-                    PlayerManager.BoughtCloseList.Add(id);
+                    PlayerManager.BoughtCloseIDs.Add(id);
                 }
 
                 ConfigManager.SaveDress();
 
 
-                Transform tra = PlayerManager.SeleTra;
+                Transform tra = PlayerManager.SelectedPlayer;
 
                 PlayerManager.Player = tra.GetComponent<Player>();
 
                 tra.parent = null;
 
-                ResourceManager.TraDic.Add(tra.name, tra);
+                ResourceManager.TransformDictionary.Add(tra.name, tra);
 
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
 
-                if (PlayerManager.PlayerPink != PlayerManager.SeleTra)
+                if (PlayerManager.DefaultPinkPlayer != PlayerManager.SelectedPlayer)
                 {
-                    PlayerManager.PlayerPink.GetComponentInChildren<Renderer>(true).CreateTweenRenderer(0, 0.25f, true, false, Curve.EaseOutQuad, false, true).StartForward();
+                    PlayerManager.DefaultPinkPlayer.GetComponentInChildren<Renderer>(true).CreateTweenRenderer(0, 0.25f, true, false, Curve.EaseOutQuad, false, true).StartForward();
                 }
 
-                if (PlayerManager.PlayerBlond != PlayerManager.SeleTra)
+                if (PlayerManager.DefaultBlondPlayer != PlayerManager.SelectedPlayer)
                 {
-                    PlayerManager.PlayerBlond.GetComponentInChildren<Renderer>(true).CreateTweenRenderer(0, 0.25f, true, false, Curve.EaseOutQuad, false, true).StartForward();
+                    PlayerManager.DefaultBlondPlayer.GetComponentInChildren<Renderer>(true).CreateTweenRenderer(0, 0.25f, true, false, Curve.EaseOutQuad, false, true).StartForward();
                 }
 
-                if (PlayerManager.PlayerBrown != PlayerManager.SeleTra)
+                if (PlayerManager.DefaultBrownPlayer != PlayerManager.SelectedPlayer)
                 {
-                    PlayerManager.PlayerBrown.GetComponentInChildren<Renderer>(true).CreateTweenRenderer(0, 0.25f, true, false, Curve.EaseOutQuad, false, true).StartForward();
+                    PlayerManager.DefaultBrownPlayer.GetComponentInChildren<Renderer>(true).CreateTweenRenderer(0, 0.25f, true, false, Curve.EaseOutQuad, false, true).StartForward();
                 }
 
                 ResourceManager.Get(TutorialLabel.PlayerBk1).SetCollider(false);
                 ResourceManager.Get(TutorialLabel.PlayerBk2).SetCollider(false);
                 ResourceManager.Get(TutorialLabel.PlayerBk3).SetCollider(false);
 
-                tra.CreateTweenScale(ResourceManager.Get(GardenLabel.PlayerPosTra).localScale, 1f, true, true, Curve.EaseOutQuad);
-                tra.CreateTweenVec3D(ResourceManager.Get(GardenLabel.PlayerPosTra).position, 1f, false, true, true, Curve.EaseOutQuad);
-                tra.SetParent(ResourceManager.Get(GardenLabel.GardenNormal));
+                tra.CreateTweenScale(ResourceManager.Get(GardenLabel.GardenPlayerPos).localScale, 1f, true, true, Curve.EaseOutQuad);
+                tra.CreateTweenVec3D(ResourceManager.Get(GardenLabel.GardenPlayerPos).position, 1f, false, true, true, Curve.EaseOutQuad);
+                tra.SetParent(ResourceManager.Get(GardenLabel.GardenPivot));
 
                 tra.TweenForVec();
                 tra.TweenForScale();
@@ -545,11 +548,11 @@ public class TutorialManager : Regist
             {
                 Transform tra = ResourceManager.Get(ObjectLabel.G_RegularGrid).GetChild(0);
 
-                Tutorial.HightScreen(tra.FindChild(FlowerItemLabel.Arrow0), tra);
+                Tutorial.HightScreen(tra.FindChild(FlowerItemLabel.ArrowPos), tra);
             }
         );
 
-        FlowerInfo flowerInfo = GardenManager.FlowerInfoDic[1];
+        FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[1];
 
         flowerInfo.Button.AddButtonEventOnetime
         (
@@ -652,16 +655,16 @@ public class TutorialManager : Regist
             EventType.ForwardFinish, 
             () =>
             {
-                Transform tra = Manager.SkillDic["Ability1"].SkillItem;
+                Transform tra = Manager.SkillDictionary["Ability1"].SkillItem;
 
-                Tutorial.HightScreen(tra.FindChild(SkillItemLabel.Arrow0), tra.FindChild(SkillItemLabel.Arrow1), tra.FindChild(SkillItemLabel.Btn));
+                Tutorial.HightScreen(tra.FindChild(SkillItemLabel.ArrowPosition), tra.FindChild(SkillItemLabel.ArrowDestination), tra.FindChild(SkillItemLabel.Button));
             }
         );
 
 
-        SkillRoot skill = Manager.SkillDic["Ability1"];
+        SkillRoot skill = Manager.SkillDictionary["Ability1"];
 
-        skill.ItemBtn.AddButtonEventOnetime
+        skill.button.AddButtonEventOnetime
         (
             () =>
             {
@@ -705,16 +708,16 @@ public class TutorialManager : Regist
             EventType.BackwardFinish,
             () =>
             {
-                Transform tra = Manager.SkillDic["Skill1"].SkillItem;
+                Transform tra = Manager.SkillDictionary["Skill1"].SkillItem;
 
-                Tutorial.HightScreen(tra.FindChild(SkillItemLabel.Arrow0), tra.FindChild(SkillItemLabel.Arrow1), tra.FindChild(SkillItemLabel.Btn));
+                Tutorial.HightScreen(tra.FindChild(SkillItemLabel.ArrowPosition), tra.FindChild(SkillItemLabel.ArrowDestination), tra.FindChild(SkillItemLabel.Button));
             }
         );
 
 
-        SkillRoot skill = Manager.SkillDic["Skill1"];
+        SkillRoot skill = Manager.SkillDictionary["Skill1"];
 
-        skill.ItemBtn.AddButtonEventOnetime
+        skill.button.AddButtonEventOnetime
         (
             () =>
             {
@@ -968,7 +971,7 @@ public class TutorialManager : Regist
 
         MiniGameManager.Pause = true;
 
-        int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
+        int index = MiniGameManager.GetMemoryGameButtonIndex(MiniGameManager.FindGameIndexList[0]);
         Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
         Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
         button.AddButtonEventOnetime
@@ -983,7 +986,7 @@ public class TutorialManager : Regist
 
     public static void ShowSecondCorrectButton()
     {
-        int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
+        int index = MiniGameManager.GetMemoryGameButtonIndex(MiniGameManager.FindGameIndexList[0]);
         Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
         Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
         button.AddButtonEventOnetime
@@ -998,7 +1001,7 @@ public class TutorialManager : Regist
 
     public static void ShowThirdCorrectButton()
     {
-        int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
+        int index = MiniGameManager.GetMemoryGameButtonIndex(MiniGameManager.FindGameIndexList[0]);
         Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
         Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
         button.AddButtonEventOnetime
@@ -1013,7 +1016,7 @@ public class TutorialManager : Regist
 
     public static void ShowFourthCorrectButton()
     {
-        int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
+        int index = MiniGameManager.GetMemoryGameButtonIndex(MiniGameManager.FindGameIndexList[0]);
         Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
         Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
         button.AddButtonEventOnetime
@@ -1028,7 +1031,7 @@ public class TutorialManager : Regist
 
     public static void ShowFifthCorrectButton()
     {
-        int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
+        int index = MiniGameManager.GetMemoryGameButtonIndex(MiniGameManager.FindGameIndexList[0]);
         Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
         Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
         button.AddButtonEventOnetime
@@ -1043,7 +1046,7 @@ public class TutorialManager : Regist
 
     public static void ShowSixthCorrectButton()
     {
-        int index = MiniGameManager.MemoryGameIndexMap(MiniGameManager.IndexList[0]);
+        int index = MiniGameManager.GetMemoryGameButtonIndex(MiniGameManager.FindGameIndexList[0]);
         Button button = MiniGameManager.D_MemoryGameBtns[index].GetComponent<Button>();
         Tutorial.HightScreen(MiniGameManager.D_MemoryGameArrows[index], button.transform);
         button.AddButtonEventOnetime
@@ -1075,7 +1078,7 @@ public class TutorialManager : Regist
             EventType.BackwardFinish,
             () =>
             {
-                Tutorial.MaskLock = true;
+                Tutorial.MaskFlag = true;
 
                 ResourceManager.SetActive(ObjectLabel.N_Button, false);
                 ResourceManager.SetActive(ObjectLabel.N_Tutorial, false);

Assets/Script/Manage/UIManager.cs

@@ -16,21 +16,26 @@ public class UIManager : Regist
 {
     #region Config
 
-    public static bool Complete;
+    public static bool Initd;
+
+    private static int MaxSkillDisplayAmt = 2;
+    private static int MaxAbilityDisplayAmt = 3;
+    private static int MinigameDisplayCoinAwardRatio = 10;
+    private static int MinigameDisplayDiamondAward = 10;
 
-    public static UIManager Instance;
-    public static Coroutine StopCreditsCoroutine;
     public static Transform Canvas;
     public static Transform Camera;
-    public static Transform Transform;
     public static Transform EventSystem;
+    public static Coroutine StopPlayCreditsRoutine;
+
+    public static UIManager Instance;
 
     #endregion
 
 
-    public static void InitialInstantiate()
+    public static void Init()
     {
-        if (Complete)
+        if (Initd)
         {
             return;
         }
@@ -42,7 +47,7 @@ public class UIManager : Regist
 
         Transform tra = new GameObject(ResourceLabel.UI).transform;
 
-        tra.parent = Transform;
+        tra.parent = Instance.transform;
 
         Canvas = ResourceManager.Get(ResourceLabel.Canvas, Folder.UI, true, tra, false, ObjType.Canvas);
         Camera = ResourceManager.Get(ResourceLabel.MainCamera, Folder.UI, true, tra, false, ObjType.MainCamera);
@@ -51,7 +56,7 @@ public class UIManager : Regist
         ResourceManager.SetActive(ObjectLabel.C_Main, true);
         ResourceManager.SetActive(ObjectLabel.U_LoadingPanel, true);
 
-        Complete = true;
+        Initd = true;
     }
 
 
@@ -62,18 +67,17 @@ public class UIManager : Regist
             return true;
         }
 
-        Transform = transform;
+        Instance = this;
 
         return false;
     }
 
     public override void InstantiatePrefabs()
     {
-        InitialInstantiate();
+        Init();
     }
 
-    private int MinigameDisplayCoinAwardRatio = 10;
-    private int MinigameDisplayDiamondAward = 10;
+
     public override void FirstInit()
     {
         Instance = this;
@@ -138,9 +142,9 @@ public class UIManager : Regist
 
                 ResourceManager.Get(ObjectLabel.Ba_Notice).TweenBacCG();
 
-                Manager.OfflineLock = false;
+                Manager.OfflineFlag = false;
 
-                if (!SignManager.ShowOfflinePanel())
+                if (!SignManager.ShowPanels())
                 {
                     ResourceManager.Get(ObjectLabel.B_SignIn).TweenBacCG();
                 }
@@ -157,7 +161,7 @@ public class UIManager : Regist
             ObjectLabel.Bb_Get,
             () =>
             {
-                SignManager.GetSignReward();
+                SignManager.GetSignAward();
             }
         );
 
@@ -190,7 +194,7 @@ public class UIManager : Regist
                 ResourceManager.Get(ObjectLabel.B_SignIn).TweenBacCG();
                 ResourceManager.Get(ObjectLabel.Bb_SignIn).TweenBacCG();
 
-                SignManager.ShowOfflinePanel();
+                SignManager.ShowPanels();
             }
         );
 
@@ -238,7 +242,7 @@ public class UIManager : Regist
 
                     ResourceManager.Get(ObjectLabel.Bd_Mail0).TweenBacCG();
 
-                    if (!SignManager.ShowOfflinePanel())
+                    if (!SignManager.ShowPanels())
                     {
                         ResourceManager.Get(ObjectLabel.B_SignIn).TweenBacCG();
                     }
@@ -392,7 +396,7 @@ public class UIManager : Regist
             ObjectLabel.C_MiniGame,
             () =>
             {
-                ResourceManager.Get(GardenLabel.GardenMini).TweenForVec();
+                ResourceManager.Get(GardenLabel.Minigame).TweenForVec();
 
                 ResourceManager.Get(ObjectLabel.D_MiniGame).TweenForCG();
 
@@ -421,7 +425,7 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                if (Manager.Level < 13)
+                if (Manager.GardenLevel < 13)
                 {
                     Toast.Show(1.5f, Language.GetStr(LanguageLabel.UI__C_DressRoom));
                 }
@@ -444,7 +448,7 @@ public class UIManager : Regist
             ObjectLabel.C_Visit,
             () =>
             {
-                VisitManager.Visit(ArchiveSource.Random);
+                VisitManager.Visit(ConfigSource.Random);
             }
         );
 
@@ -548,7 +552,7 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                PlazaRoomManager.OpenPanel();
+                PlazaRoomManager.OpenJoinRoomPanel();
             }
         );
 
@@ -602,7 +606,7 @@ public class UIManager : Regist
             ObjectLabel.D_Rip2,
             () =>
             {
-                MiniGameManager.OperatePunchGame(OpType.Rip);
+                MiniGameManager.OnPunchGameClick(OpType.Rip);
             }
         );
 
@@ -632,7 +636,7 @@ public class UIManager : Regist
                 ResourceManager.Get(ObjectLabel.Da_DiamondGroup).GetTweenScale().InDestination = true;
 
                 ResourceManager.SetText(ObjectLabel.Da_Tit, Language.GetStr(LanguageLabel.UI__Da_Tit0));
-                ResourceManager.SetText(ObjectLabel.Da_CoinLab, $"{MinigameDisplayCoinAwardRatio*Manager.Level}+");
+                ResourceManager.SetText(ObjectLabel.Da_CoinLab, $"{MinigameDisplayCoinAwardRatio*Manager.GardenLevel}+");
                 ResourceManager.SetText(ObjectLabel.Da_DiamondLab, $"{MinigameDisplayDiamondAward}+");
 
                 ResourceManager.SetActive(ObjectLabel.Da_Lab, true);
@@ -653,11 +657,11 @@ public class UIManager : Regist
                 ResourceManager.Get<ContentSizeFitter>(ObjectLabel.Da_CoinGroup).enabled = true;
                 ResourceManager.Get<ContentSizeFitter>(ObjectLabel.Da_DiamondGroup).enabled = true;
 
-                if (!Award.FlowerLock)
+                if (!MinigameAward.HaveNewFlowerFlag)
                 {
                     ResourceManager.Get(ObjectLabel.Da_FlowerGroup).GetTweenScale().InDestination = true;
 
-                    FlowerInfo flowerInfo = GardenManager.FlowerInfoDic[Award.FlowerID];
+                    FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[MinigameAward.UnlockFlowerID];
 
                     ResourceManager.SetActive(ObjectLabel.Da_Flower, true);
 
@@ -702,7 +706,7 @@ public class UIManager : Regist
             ObjectLabel.D_Water2,
             () =>
             {
-                MiniGameManager.OperatePunchGame(OpType.Water);
+                MiniGameManager.OnPunchGameClick(OpType.Water);
             }
         );
 
@@ -723,7 +727,7 @@ public class UIManager : Regist
 
             () =>
             {
-                MiniGameManager.OperatePunchGame(OpType.Fertilize);
+                MiniGameManager.OnPunchGameClick(OpType.Fertilize);
             }
         );
 
@@ -756,14 +760,14 @@ public class UIManager : Regist
             ResourceManager.SetText(ObjectLabel.D_BeginLab, Language.GetStr(LanguageLabel.UI__D_BeginLab0));
             ResourceManager.SetText(ObjectLabel.D_StatusLab, Language.GetStr(LanguageLabel.UI__D_StatusLab0));
 
-            GardenManager.MiniLock = false;
+            GardenManager.InMinigameFlag = false;
         };
 
         tween.OnForwardFinish += () =>
         {
             AudioManager.MinigameAudio.TweenForAudio();
 
-            ResourceManager.SetActive(GardenLabel.GardenNormal, false);
+            ResourceManager.SetActive(GardenLabel.GardenPivot, false);
 
             GardenManager.RetrieveAllElf();
             IAPManager.RetrieveADChest();
@@ -773,7 +777,7 @@ public class UIManager : Regist
         {
             AudioManager.MinigameAudio.TweenBacAudio();
 
-            ResourceManager.SetActive(GardenLabel.GardenNormal, true);
+            ResourceManager.SetActive(GardenLabel.GardenPivot, true);
         };
 
         tween.OnBackwardFinish += () =>
@@ -783,24 +787,24 @@ public class UIManager : Regist
 
             AudioManager.GardenThemeAudio.TweenForAudio();
 
-            GardenManager.MiniLock = true;
+            GardenManager.InMinigameFlag = true;
 
             #region PunchGame
 
-            if (MiniGameManager.PunchGame)
+            if (MiniGameManager.miniGameType == MiniGameManager.MiniGameType.Punch)
             {
-                for (int i = 0; i < MiniGameManager.OperateList.Count; i++)
+                for (int i = 0; i < MiniGameManager.PunchGameOperateList.Count; i++)
                 {
-                    MiniGameManager.OperateList[i].Retrieve();
+                    MiniGameManager.PunchGameOperateList[i].RetrieveFlower();
 
-                    MiniGameManager.OperateList.RemoveAt(i--);
+                    MiniGameManager.PunchGameOperateList.RemoveAt(i--);
                 }
 
-                for (int i = 0; i < MiniGameManager.IdleList.Count; i++)
+                for (int i = 0; i < MiniGameManager.MinigameIdleFlowerList.Count; i++)
                 {
-                    MiniGameManager.IdleList[i].Retrieve();
+                    MiniGameManager.MinigameIdleFlowerList[i].RetrieveFlower();
 
-                    MiniGameManager.IdleList.RemoveAt(i--);
+                    MiniGameManager.MinigameIdleFlowerList.RemoveAt(i--);
                 }
             }
 
@@ -808,22 +812,22 @@ public class UIManager : Regist
 
             #region MemoryGame
 
-            if (MiniGameManager.MemoryGame)
+            if (MiniGameManager.miniGameType == MiniGameManager.MiniGameType.Memory)
             {
-                for (int i = 0; i < MiniGameManager.FadeList.Count; i++)
+                for (int i = 0; i < MiniGameManager.MemoryGameFadeList.Count; i++)
                 {
-                    MiniGameManager.FadeList[i].FlowerIcon.GetTweenSr().InOrigin = true;
+                    MiniGameManager.MemoryGameFadeList[i].FlowerIcon.GetTweenSr().InOrigin = true;
 
-                    MiniGameManager.FadeList[i].Retrieve();
+                    MiniGameManager.MemoryGameFadeList[i].RetrieveFlower();
 
-                    MiniGameManager.FadeList.RemoveAt(i--);
+                    MiniGameManager.MemoryGameFadeList.RemoveAt(i--);
                 }
 
-                for (int i = 0; i < MiniGameManager.IdleList.Count; i++)
+                for (int i = 0; i < MiniGameManager.MinigameIdleFlowerList.Count; i++)
                 {
-                    MiniGameManager.IdleList[i].Retrieve();
+                    MiniGameManager.MinigameIdleFlowerList[i].RetrieveFlower();
 
-                    MiniGameManager.IdleList.RemoveAt(i--);
+                    MiniGameManager.MinigameIdleFlowerList.RemoveAt(i--);
                 }
             }
 
@@ -831,15 +835,15 @@ public class UIManager : Regist
 
             #region FindGame
 
-            if (MiniGameManager.FindGame)
+            if (MiniGameManager.miniGameType == MiniGameManager.MiniGameType.Find)
             {
-                MiniGameManager.IdleList.ForEach
+                MiniGameManager.MinigameIdleFlowerList.ForEach
                 (
                     flower =>
                     {
                         flower.FlowerIcon.GetTweenSr().InOrigin = true;
 
-                        flower.Retrieve();
+                        flower.RetrieveFlower();
                     },
                     true
                 );
@@ -903,7 +907,7 @@ public class UIManager : Regist
                 AudioManager.PlayClip(AudioLabel.Close);
 
                 ResourceManager.Get(ObjectLabel.Da_Info).TweenBacCG();
-                ResourceManager.Get(GardenLabel.GardenMini).TweenBacVec();
+                ResourceManager.Get(GardenLabel.Minigame).TweenBacVec();
                 ResourceManager.Get(ObjectLabel.D_MiniGame).TweenBacCG();
 
                 MiniGameManager.GameEnd();
@@ -947,10 +951,10 @@ public class UIManager : Regist
                 AudioManager.PlayClip(AudioLabel.GetCurrent);
 
                 ResourceManager.Get(ObjectLabel.Da_Info).TweenBacCG();
-                ResourceManager.Get(GardenLabel.GardenMini).TweenBacVec();
+                ResourceManager.Get(GardenLabel.Minigame).TweenBacVec();
                 ResourceManager.Get(ObjectLabel.D_MiniGame).TweenBacCG();
 
-                InfoBoxManager.GardenInfoBox.Show(Award.Info, 10f, Color.white, Lib.Atlas);
+                InfoBoxManager.GardenInfoBox.Display(MinigameAward.DisplayContent, 10f, Color.white, Lib.Atlas);
             }
         );
 
@@ -1034,12 +1038,12 @@ public class UIManager : Regist
         };
 
 
-        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn1, () => { MiniGameManager.OperateMemoryGame(0,0); });
-        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn2, () => { MiniGameManager.OperateMemoryGame(1,1); });
-        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn3, () => { MiniGameManager.OperateMemoryGame(2,3); });
-        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn4, () => { MiniGameManager.OperateMemoryGame(3,4); });
-        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn5, () => { MiniGameManager.OperateMemoryGame(4,6); });
-        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn6, () => { MiniGameManager.OperateMemoryGame(5,7); });
+        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn1, () => { MiniGameManager.OnMemoryGameClick(0,0); });
+        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn2, () => { MiniGameManager.OnMemoryGameClick(1,1); });
+        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn3, () => { MiniGameManager.OnMemoryGameClick(2,3); });
+        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn4, () => { MiniGameManager.OnMemoryGameClick(3,4); });
+        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn5, () => { MiniGameManager.OnMemoryGameClick(4,6); });
+        ResourceManager.AddButtonEvent(ObjectLabel.D_FlowerBtn6, () => { MiniGameManager.OnMemoryGameClick(5,7); });
 
         #endregion
 
@@ -1140,7 +1144,7 @@ public class UIManager : Regist
             ObjectLabel.Ea_Send,
             () =>
             {
-                HttpManager.Save();
+                HttpManager.UploadConfig();
             }
         );
 
@@ -1195,7 +1199,7 @@ public class UIManager : Regist
             () =>
             {
                 SignManager.SignIndex = 7;
-                SignManager.SignTime = new DateTime(2017, 2, 3);
+                SignManager.LastSignTime = new DateTime(2017, 2, 3);
 
                 ResourceManager.Get(ObjectLabel.B_SignIn).TweenForCG();
                 ResourceManager.Get(ObjectLabel.Bb_SignIn).TweenForCG();
@@ -1212,7 +1216,7 @@ public class UIManager : Regist
             ObjectLabel.Ea_Cool,
             () =>
             {
-                Manager.MiniTimer = 0;
+                Manager.MinigameCDTimer = 0;
             }
         );
 
@@ -1673,7 +1677,7 @@ public class UIManager : Regist
 
             ResourceManager.Get(ObjectLabel.C_Main).TweenBacCG();
 
-            if (GardenManager.MyFlowerSpec == 0)
+            if (GardenManager.TotalUnlockSpecialFlower == 0)
             {
                 ResourceManager.SetActive(ObjectLabel.G_Special, false);
             }
@@ -1681,7 +1685,7 @@ public class UIManager : Regist
 
         tween.OnBackwardStart += () =>
         {
-            foreach (var kv in GardenManager.FlowerInfoDic)
+            foreach (var kv in GardenManager.FlowerInfoDictionary)
             {
                 kv.Value.UIPartical.Animator.SetTrigger("Stop");
             }
@@ -1746,7 +1750,7 @@ public class UIManager : Regist
 
                 ResourceManager.Get(ObjectLabel.G_Flower).TweenBacCG();
 
-                GardenManager.RetriveFlowerAll();
+                GardenManager.RetriveAllFlower();
             }
         );
 
@@ -1787,8 +1791,8 @@ public class UIManager : Regist
             ResourceManager.Get(ObjectLabel.H_Icon1).FindChild($"{ObjectLabel.H_UIFlashLight}/{ObjectLabel.H_UIFlash}").SetActive(false);
             ResourceManager.Get(ObjectLabel.H_Icon1).FindChild($"{ObjectLabel.H_UIFlashLight}/{ObjectLabel.H_UIParticleSystem}").SetActive(false);
 
-            if (GardenManager.FlowerCardMatTween != null)
-                GardenManager.FlowerCardMatTween.Pause();
+            if (GardenManager.FlowerCardMaterialTween != null)
+                GardenManager.FlowerCardMaterialTween.Pause();
         };
 
         #endregion
@@ -1802,7 +1806,7 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                GardenManager.PlantFlower(GardenManager.SeleInfo);
+                GardenManager.PlantFlower(GardenManager.SelectFlowerInfo);
             }
         );
 
@@ -1913,7 +1917,7 @@ public class UIManager : Regist
                 ResourceManager.Get(ObjectLabel.Lc_CreditsMask).TweenBacCG();
                 ResourceManager.Get(ObjectLabel.Lc_CreditsContent).TweenBacCG();
                 
-                Auxiliary.Instance.StopCoroutine(StopCreditsCoroutine);
+                Auxiliary.Instance.StopCoroutine(StopPlayCreditsRoutine);
             }
         );
 
@@ -2156,7 +2160,7 @@ public class UIManager : Regist
                 }
                 else
                 {
-                    Manager.Download(id);
+                    Manager.SwitchConfig(id);
                 }
             }
         );
@@ -2194,7 +2198,7 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                HttpManager.Report();
+                HttpManager.ReportIssue();
             }
         );
 
@@ -2366,7 +2370,7 @@ public class UIManager : Regist
                 ObjectLabel.P_Save,
                 () =>
                 {
-                    PlayerManager.Player.Save(true);
+                    PlayerManager.Player.SaveDressDatas(true);
                 }
             );
 
@@ -2379,7 +2383,7 @@ public class UIManager : Regist
                 ObjectLabel.P_Reset,
                 () =>
                 {
-                    PlayerManager.Player.Reset();
+                    PlayerManager.Player.ResetDressDatas();
                 }
             );
 
@@ -2667,7 +2671,7 @@ public class UIManager : Regist
             ObjectLabel.P_Return,
             () =>
             {
-                PlayerManager.Player.Return();
+                PlayerManager.Player.LeaveDressroom();
             }
         );
 
@@ -2797,7 +2801,7 @@ public class UIManager : Regist
         tween.OnBackwardFinish +=
             () =>
             {
-                SignManager.ShowOfflinePanel();
+                SignManager.ShowPanels();
             };
 
         ResourceManager.Get(ObjectLabel.R_NotifyBK).CreateTweenScale(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
@@ -3170,7 +3174,7 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.Close);
 
-                PlazaRoomChest.CurrentChest.GetAward(ResourceManager.Get<InputField>(ObjectLabel.Y_InputField).text);
+                PlazaRoomChest.SelectedChest.GetAward(ResourceManager.Get<InputField>(ObjectLabel.Y_InputField).text);
             }
         );
 
@@ -3215,7 +3219,7 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                PlazaRoomManager.OpenCreatePanel();
+                PlazaRoomManager.OpenCreateRoomPanel();
             }
         );
 
@@ -3230,7 +3234,7 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.Close);
 
-                PlazaRoomManager.ClosePanel();
+                PlazaRoomManager.CloseJoinRoomPanel();
             }
         );
 
@@ -3245,10 +3249,10 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                if (PlazaRoomManager.FilterEnabled)
-                    PlazaRoomManager.DisableFilter();
+                if (PlazaRoomManager.FilterFlag)
+                    PlazaRoomManager.DisableCreateByMeFilter();
                 else
-                    PlazaRoomManager.EnableFilter();
+                    PlazaRoomManager.EnableCreateByMeFilter();
             }
         );
 
@@ -3275,7 +3279,7 @@ public class UIManager : Regist
             {
                 AudioManager.PlayClip(AudioLabel.Close);
 
-                PlazaRoomManager.CloseCreatePanel();
+                PlazaRoomManager.CloseCreateRoomPanel();
             }
         );
 
@@ -3302,7 +3306,7 @@ public class UIManager : Regist
 
         if (!TutorialManager.NewplayerTutorial)
         {
-            SetEnterGameLabel();
+            SetEnterMinigameGameLabel();
         }
 
         ResourceManager.Get(ObjectLabel.C_Group).GetTweenCG().InOrigin = true;
@@ -3314,11 +3318,10 @@ public class UIManager : Regist
 
     public override void TutorialToRegular()
     {
-        SetEnterGameLabel();
+        SetEnterMinigameGameLabel();
     }
 
-
-    public static void SetEnterGameLabel()
+    public static void SetEnterMinigameGameLabel()
     {
         HudTarget hudTarget = ResourceManager.Get(ObjectLabel.C_MiniGame).AddComponent<HudTarget>();
 
@@ -3332,7 +3335,7 @@ public class UIManager : Regist
 
     public void LoginCallback(JsonData jsonData)
     {
-        if (HttpManager.Connect)
+        if (HttpManager.IsConnect)
         {
             ResourceManager.Get(ObjectLabel.Fg_Reconnect).TweenBacCG();
 
@@ -3355,7 +3358,7 @@ public class UIManager : Regist
         ResourceManager.Get(ObjectLabel.Lc_CreditsContent).TweenForCG();
         ResourceManager.Get(ObjectLabel.Lc_CreditsContent).TweenReForVec();
 
-        StopCreditsCoroutine = Auxiliary.Instance.DelayCall
+        StopPlayCreditsRoutine = Auxiliary.Instance.DelayCall
         (
             () =>
             {
@@ -3366,7 +3369,8 @@ public class UIManager : Regist
         );
     }
 
-    public static void UpdateHint()
+
+    public static void UpdateManagePanelHint() //侧边栏红色描边
     {
         if (TutorialManager.NewplayerTutorial)
         {
@@ -3401,8 +3405,7 @@ public class UIManager : Regist
         tween.Pause();
     }
 
-    private static int MaxSkillDisplayAmt = 2;
-    private static int MaxAbilityDisplayAmt = 3;
+
     public static void OpenManagePanel()
     {
         ResourceManager.Get(ObjectLabel.F_Manage0).TweenForVec();
@@ -3491,7 +3494,8 @@ public class UIManager : Regist
         }
     }
 
-    public static void NavigateBuyCoin()
+
+    public static void NavigateToBuyCoin()
     {
         ResourceManager.Get<Button>(ObjectLabel.F_Magic).onClick.Invoke();
 
@@ -3507,7 +3511,7 @@ public class UIManager : Regist
             );
     }
 
-    public static void NavigateBuyDiamond()
+    public static void NavigateToBuyDiamond()
     {
         ResourceManager.Get<Button>(ObjectLabel.F_Store).onClick.Invoke();
 

Assets/Script/Manage/VisitManager.cs

@@ -11,7 +11,7 @@ using System.Collections.Generic;
 
 using Random = UnityEngine.Random;
 
-public enum ArchiveSource
+public enum ConfigSource
 {
     Fake,
     Random,
@@ -38,99 +38,99 @@ public class VisitManager : Regist
 
     #region 配置
 
-    public static int Cost
+    public static int VisitCost
     {
-        get { return Cost_; }
+        get { return visitCost; }
         set
         {
-            Cost_ = value;
+            visitCost = value;
 
-            ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text = TransferLabel.CoinSprite + Cost;
+            ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text = TransferLabel.CoinSprite + VisitCost;
         }
     }
+    public static int visitCost;
 
-    public static int Cost_;
-
-
-    public static int CoolTime;
-    public static float FancyRate;
-    public static float AwardRate;
-    public static float CreateRate;
-    public static string CostFml;
+    public static int VisitCDTime;
+    public static float FancyGardenRate;
+    public static float CreateAwardRate;
+    public static float FakeGardenRate;
+    public static string VisitCostFml;
     public static string AwardMinFml;
     public static string AwardMaxFml;
 
     #endregion
 
-    public static float PullTimer;
+    public static int MaxTipAmt = 10;
+
+    public static int MaxStachConfigAmt = 8;
+    public static float PullArchiveTime = 0.5f;
+    public static float PullConfigTimer;
     public static List<VisitData> UsedDataList = new List<VisitData>();
     public static List<VisitData> UnusedDataList = new List<VisitData>();
 
+    public static bool Inited;
     public static bool InVisit;
-    public static bool Complete;
-    public static bool LoadComplete;
-    public static bool TweenComplete;
+    public static bool IsPullConfigComplete;
+    public static bool IsBlackMaskTweenComplete;
 
-    public static int Slot;
-    public static int Level;
-    public static XmlNode Node;
-    public static XmlDocument Document;
-
-    public static int VisiteePraise;
+    public static int VisiteeLevel;
+    public static int VisiteeTotalSlot;
+    public static int VisiteePraiseAmt;
     public static string VisiteeSerialNumber;
+    public static XmlNode VisiteeRootNode;
+    public static XmlDocument VisiteeDocument;
+    public static List<Slot> VisiteePlantList;
 
-    public static bool OriginBird;
-    public static bool OriginTree;
-    public static bool OriginRainbow;
-    public static List<Slot> VisitPlantList;
-    public static List<Slot> OriginPlantList;
-    public static List<ElfType> OriginElfList;
+    public static bool PlayerBirdFlag;
+    public static bool PlayerTreeFlag;
+    public static bool PlayerRainbowFlag;
+    public static List<Slot> PlayerPlantList;
+    public static List<ElfType> PlayerElfList;
 
     #endregion
 
-    private int MaxStachAmt = 8;
-    private float PullArchiveTime = 0.5f;
     public void Update()
     {
-        if (UnusedDataList.Count > MaxStachAmt)
+        if (UnusedDataList.Count > MaxStachConfigAmt)
         {
             return;
         }
 
-        PullTimer += Time.deltaTime;
+        PullConfigTimer += Time.deltaTime;
 
-        if (PullTimer >= PullArchiveTime)
+        if (PullConfigTimer >= PullArchiveTime)
         {
-            PullTimer = 0;
+            PullConfigTimer = 0;
 
-            HttpManager.RandomLoad
+            HttpManager.GetRandomConfig
             (
                 data =>
                 {
-                    PullArchiveCallback(data, null, SavePulledArchive);
+                    PullConfigCallback(data, null, SavePulledConfig);
                 }
             );
         }
     }
 
-    public static void Initialize()
+
+    public static void Init()
     {
         XmlAttributeCollection attribute = ConfigManager.GetVisitConfig();
 
-        CostFml = attribute[5].Value;
+        VisitCostFml = attribute[5].Value;
 
-        Cost = Mathf.FloorToInt((float)Auxiliary.FmlParse(CostFml, "l", Manager.Level.ToString()));
+        VisitCost = Mathf.FloorToInt((float)Auxiliary.FmlParse(VisitCostFml, "l", Manager.GardenLevel.ToString()));
         AwardMinFml = attribute[2].Value;
         AwardMaxFml = attribute[3].Value;
 
-        CoolTime = int.Parse(attribute[4].Value);
-        FancyRate = float.Parse(attribute[7].Value);
-        AwardRate = float.Parse(attribute[1].Value);
-        CreateRate = float.Parse(attribute[6].Value);
+        VisitCDTime = int.Parse(attribute[4].Value);
+        FancyGardenRate = float.Parse(attribute[7].Value);
+        CreateAwardRate = float.Parse(attribute[1].Value);
+        FakeGardenRate = float.Parse(attribute[6].Value);
 
         #region 倒计时
 
-        if (CoolTime != 0)
+        if (VisitCDTime != 0)
         {
             Text text = ResourceManager.Get<Text>(ObjectLabel.C_VisitLab);
 
@@ -143,7 +143,7 @@ public class VisitManager : Regist
             Vector3 v2 = new Vector3(0.4f, 0.4f, 0.4f);
             Vector3 v3 = new Vector3(0, 0, 0);
 
-            for (int i = 0; i < CoolTime - 1; i++)
+            for (int i = 0; i < VisitCDTime - 1; i++)
             {
                 delayList.Add(0.5f);
                 delayList.Add(0);
@@ -151,7 +151,7 @@ public class VisitManager : Regist
 
             delayList.Add(0.5f);
 
-            for (int i = 0; i < CoolTime; i++)
+            for (int i = 0; i < VisitCDTime; i++)
             {
                 durationList.Add(0.25f);
                 durationList.Add(0.25f);
@@ -164,7 +164,7 @@ public class VisitManager : Regist
                 (
                     () =>
                     {
-                        text.text = (CoolTime - tempInt).ToString();
+                        text.text = (VisitCDTime - tempInt).ToString();
                         AudioManager.PlayClip(AudioLabel.ClickButton);
                     }
                 );
@@ -192,10 +192,26 @@ public class VisitManager : Regist
 
         #endregion
 
-        Complete = true;
+        Inited = true;
     }
 
 
+    public static void EnterVisiteeGarden(VisitData visitData)
+    {
+        IsPullConfigComplete = true;
+        VisiteePraiseAmt = int.Parse(visitData.JsonData["p"].ToString());
+        if (visitData.JsonData.Inst_Object.ContainsKey("i"))
+        {
+            VisiteeSerialNumber = visitData.JsonData["i"].ToString();
+        }
+
+        VisiteeDocument = visitData.Document;
+
+        SetVisiteeCommentPanel();
+
+        EnterVisiteeGarden();
+    }
+
     public static void ExitVisiteeGarden()
     {
         ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
@@ -212,31 +228,31 @@ public class VisitManager : Regist
         ResourceManager.SetActive(ObjectLabel.C_Return, false);
         ResourceManager.SetActive(ObjectLabel.C_Garden, false);
 
-        GardenManager.MiniLock = true;
+        GardenManager.InMinigameFlag = true;
 
         #region Garden
 
-        GardenManager.RetriveFlowerAll();
+        GardenManager.RetriveAllFlower();
 
-        for (int i = 0; i < GardenManager.PageList.Count; i++)
+        for (int i = 0; i < GardenManager.SlotPageList.Count; i++)
         {
-            ResourceManager.Save(GardenManager.PageList[i]);
+            ResourceManager.Save(GardenManager.SlotPageList[i]);
         }
 
-        GardenManager.PageList = new List<Transform>();
+        GardenManager.SlotPageList = new List<Transform>();
 
         GardenManager.SlotList = new List<Slot>();
-        GardenManager.PageList = new List<Transform>();
+        GardenManager.SlotPageList = new List<Transform>();
 
 
         Garden.ResetPage();
         Garden.PagePos = new List<Vector3>();
 
-        int pageAmt = GardenManager.DefaultPage;
+        int pageAmt = GardenManager.DefaultSlotPage;
 
-        if (GardenManager.Slot >= GardenManager.CriticalSlotAmt)
+        if (GardenManager.TotalSlot >= GardenManager.CriticalSlotIndex)
         {
-            pageAmt = (GardenManager.Slot - GardenManager.CriticalSlotAmt) / GardenManager.TotalSlotAmtInOnePage + 3;
+            pageAmt = (GardenManager.TotalSlot - GardenManager.CriticalSlotIndex) / GardenManager.TotalSlotInOnePage + 3;
         }
 
         for (int i = 0; i < pageAmt; i++)
@@ -246,7 +262,7 @@ public class VisitManager : Regist
 
         for (int i = 0; i < GardenManager.SlotList.Count; i++)
         {
-            if (i < GardenManager.Slot)
+            if (i < GardenManager.TotalSlot)
             {
                 GardenManager.SlotList[i].Lock = true;
                 GardenManager.SlotList[i].Available = true;
@@ -270,7 +286,7 @@ public class VisitManager : Regist
 
         #region Bird Tree Rainbow
 
-        if (OriginBird)
+        if (PlayerBirdFlag)
         {
             ResourceManager.Get(GardenLabel.BirdPivot).GetTweenSr().InDestination = true;
         }
@@ -279,7 +295,7 @@ public class VisitManager : Regist
             ResourceManager.Get(GardenLabel.BirdPivot).GetTweenSr().InOrigin = true;
         }
 
-        if (OriginTree)
+        if (PlayerTreeFlag)
         {
             ResourceManager.Get(GardenLabel.GardenLeftTree).GetTweenSr().InDestination = true;
             ResourceManager.Get(GardenLabel.GardenRightTree).GetTweenSr().InDestination = true;
@@ -290,7 +306,7 @@ public class VisitManager : Regist
             ResourceManager.Get(GardenLabel.GardenRightTree).GetTweenSr().InOrigin = true;
         }
 
-        if (OriginRainbow)
+        if (PlayerRainbowFlag)
         {
             ResourceManager.Get(GardenLabel.GardenRainbow).GetTweenSr().InDestination = true;
         }
@@ -305,10 +321,10 @@ public class VisitManager : Regist
 
         ResourceManager.Save(PlayerManager.Player);
 
-        ResourceManager.TraDic.Remove(PlayerLabel.Player);
+        ResourceManager.TransformDictionary.Remove(PlayerLabel.Player);
 
         PlayerManager.Instance.GetPlayer();
-        UIManager.SetEnterGameLabel();
+        UIManager.SetEnterMinigameGameLabel();
 
         Garden.PlayerPos = new List<Vector3>();
 
@@ -318,11 +334,11 @@ public class VisitManager : Regist
 
         #endregion
 
-        GardenManager.ElfList = new List<ElfType>(OriginElfList);
+        GardenManager.ElfList = new List<ElfType>(PlayerElfList);
 
         InVisit = false;
-        LoadComplete = false;
-        TweenComplete = false;
+        IsPullConfigComplete = false;
+        IsBlackMaskTweenComplete = false;
 
         SetPlayerPraise();
         SetPlayerCommentPanel();
@@ -332,18 +348,18 @@ public class VisitManager : Regist
 
     public static void EnterVisiteeGarden()
     {
-        if (!LoadComplete || !TweenComplete)
+        if (!IsPullConfigComplete || !IsBlackMaskTweenComplete)
         {
             return;
         }
 
         ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
         //Debug.Log(Document.OuterXml);
-        SetVisiteePraise(Document);
+        SetVisiteePraise(VisiteeDocument);
 
 		ShowTip ();
 
-        Node = Document.SelectSingleNode(PlayerConfigLabel.RootNode);
+        VisiteeRootNode = VisiteeDocument.SelectSingleNode(PlayerConfigLabel.RootNode);
 
         ResourceManager.SetActive(ObjectLabel.C_Coin, false);
         ResourceManager.SetActive(ObjectLabel.C_Group1, false);
@@ -365,7 +381,7 @@ public class VisitManager : Regist
 
         ResourceManager.SetActive(ObjectLabel.C_Return, true);
 
-        GardenManager.MiniLock = false;
+        GardenManager.InMinigameFlag = false;
 
         #region Bird Tree Rainbow
 
@@ -373,17 +389,17 @@ public class VisitManager : Regist
         {
             if (ResourceManager.Get(GardenLabel.BirdPivot).gameObject.activeSelf)
             {
-                OriginBird = true;
+                PlayerBirdFlag = true;
             }
 
             if (ResourceManager.Get(GardenLabel.GardenLeftTree).gameObject.activeSelf)
             {
-                OriginTree = true;
+                PlayerTreeFlag = true;
             }
 
             if (ResourceManager.Get(GardenLabel.GardenRainbow).gameObject.activeSelf)
             {
-                OriginRainbow = true;
+                PlayerRainbowFlag = true;
             }
         }
 
@@ -396,17 +412,17 @@ public class VisitManager : Regist
 
         #region Ability
 
-        Slot = GardenManager.DefaultSlot;
-        Slot += ConfigManager.GetIntFormConfig(PlayerConfigLabel.ExtraSlot);
+        VisiteeTotalSlot = GardenManager.DefaultUnlockSlot;
+        VisiteeTotalSlot += ConfigManager.GetIntFormConfig(PlayerConfigLabel.ExtraSlot);
 
         if (!InVisit)
         {
-            OriginElfList = new List<ElfType>(GardenManager.ElfList);
+            PlayerElfList = new List<ElfType>(GardenManager.ElfList);
         }
 
         GardenManager.ElfList = new List<ElfType>();
 
-        List<XmlAttributeCollection> attributeList = ConfigManager.GetSkillList(Node);
+        List<XmlAttributeCollection> attributeList = ConfigManager.GetSkillList(VisiteeRootNode);
 
         for (int i = 0; i < attributeList.Count; i++)
         {
@@ -417,9 +433,9 @@ public class VisitManager : Regist
 
             if (attributeList[i][0].Value == "Ability1")
             {
-                Level = int.Parse(attributeList[i][3].Value);
+                VisiteeLevel = int.Parse(attributeList[i][3].Value);
 
-                ResourceManager.SetText(ObjectLabel.C_GardenLab, Language.GetStr(LanguageLabel.UI__C_GardenLab) + Level);
+                ResourceManager.SetText(ObjectLabel.C_GardenLab, Language.GetStr(LanguageLabel.UI__C_GardenLab) + VisiteeLevel);
 
                 continue;
             }
@@ -448,115 +464,115 @@ public class VisitManager : Regist
             }
             else if (attributeList[i][0].Value == "Ability6")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Bee_Purple);
             }
             else if (attributeList[i][0].Value == "Ability7")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Bee_Blue);
             }
             else if (attributeList[i][0].Value == "Ability8")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Bee_Red);
             }
             else if (attributeList[i][0].Value == "Ability9")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Bee_White);
             }
             else if (attributeList[i][0].Value == "Ability10")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Butterfly_Yellow);
             }
             else if (attributeList[i][0].Value == "Ability11")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Butterfly_Purple);
             }
             else if (attributeList[i][0].Value == "Ability12")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Butterfly_Blue);
             }
             else if (attributeList[i][0].Value == "Ability13")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Butterfly_Red);
             }
             else if (attributeList[i][0].Value == "Ability14")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Butterfly_White);
             }
             else if (attributeList[i][0].Value == "Ability15")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Dragonfly_Yellow);
             }
             else if (attributeList[i][0].Value == "Ability16")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Dragonfly_Purple);
             }
             else if (attributeList[i][0].Value == "Ability17")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Dragonfly_Blue);
             }
             else if (attributeList[i][0].Value == "Ability18")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Dragonfly_Red);
             }
             else if (attributeList[i][0].Value == "Ability19")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Dragonfly_White);
             }
             else if (attributeList[i][0].Value == "Ability20")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Beetle_Yellow);
             }
             else if (attributeList[i][0].Value == "Ability21")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Beetle_Purple);
             }
             else if (attributeList[i][0].Value == "Ability22")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Beetle_Blue);
             }
             else if (attributeList[i][0].Value == "Ability23")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Beetle_Red);
             }
             else if (attributeList[i][0].Value == "Ability24")
             {
-                Slot++;
+                VisiteeTotalSlot++;
 
                 GardenManager.ElfList.Add(ElfType.Beetle_White);
             }
@@ -568,33 +584,33 @@ public class VisitManager : Regist
 
         if (!InVisit)
         {
-            OriginPlantList = new List<Slot>(GardenManager.PlantList);
+            PlayerPlantList = new List<Slot>(GardenManager.PlantSlotList);
 
             ConfigManager.SaveDress();
             ConfigManager.SavePlantList();
         }
 
-        GardenManager.RetriveFlowerAll();
+        GardenManager.RetriveAllFlower();
 
-        for (int i = 0; i < GardenManager.PageList.Count; i++)
+        for (int i = 0; i < GardenManager.SlotPageList.Count; i++)
         {
-            ResourceManager.Save(GardenManager.PageList[i]);
+            ResourceManager.Save(GardenManager.SlotPageList[i]);
         }
 
-        GardenManager.PageList = new List<Transform>();
+        GardenManager.SlotPageList = new List<Transform>();
 
         GardenManager.SlotList = new List<Slot>();
-        GardenManager.PageList = new List<Transform>();
+        GardenManager.SlotPageList = new List<Transform>();
 
 
         Garden.ResetPage();
         Garden.PagePos = new List<Vector3>();
 
-        int pageAmt = GardenManager.DefaultPage;
+        int pageAmt = GardenManager.DefaultSlotPage;
 
-        if (Slot >= GardenManager.CriticalSlotAmt)
+        if (VisiteeTotalSlot >= GardenManager.CriticalSlotIndex)
         {
-            pageAmt = (Slot - GardenManager.CriticalSlotAmt) / GardenManager.TotalSlotAmtInOnePage + 3;
+            pageAmt = (VisiteeTotalSlot - GardenManager.CriticalSlotIndex) / GardenManager.TotalSlotInOnePage + 3;
         }
 
         for (int i = 0; i < pageAmt; i++)
@@ -604,7 +620,7 @@ public class VisitManager : Regist
         
         for (int i = 0; i < GardenManager.SlotList.Count; i++)
         {
-            if (i < Slot)
+            if (i < VisiteeTotalSlot)
             {
                 GardenManager.SlotList[i].Lock = true;
                 GardenManager.SlotList[i].Available = true;
@@ -616,7 +632,7 @@ public class VisitManager : Regist
             }
         }
 
-        List<KV<int, int>> plantList = ConfigManager.GetPlantList(Node);
+        List<KV<int, int>> plantList = ConfigManager.GetPlantList(VisiteeRootNode);
 
         for (int i = 0; i < plantList.Count; i++)
         {
@@ -629,9 +645,9 @@ public class VisitManager : Regist
 
         ResourceManager.Save(PlayerManager.Player);
 
-        ResourceManager.TraDic.Remove(PlayerLabel.Player);
+        ResourceManager.TransformDictionary.Remove(PlayerLabel.Player);
 
-        PlayerManager.Instance.GetPlayer(Node).SetAllCollider(false);
+        PlayerManager.Instance.GetPlayer(VisiteeRootNode).SetAllCollider(false);
 
         Garden.PlayerPos = new List<Vector3>();
 
@@ -643,17 +659,17 @@ public class VisitManager : Regist
 
         #region Award
         
-        if (Random.Range(0f,1f) <= AwardRate)
+        if (Random.Range(0f,1f) <= CreateAwardRate)
         {
-            if (GardenManager.PlantList.Count > 0)
+            if (GardenManager.PlantSlotList.Count > 0)
             {
-                GardenManager.PlantList.Random()[0].Flower.Award = true;
+                GardenManager.PlantSlotList.Random()[0].PlantFlower.HaveAward = true;
             }
         }
 
         #endregion
 
-        XmlNode nicknameNode = Document.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.NickName);
+        XmlNode nicknameNode = VisiteeDocument.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.NickName);
         if (nicknameNode == null || string.IsNullOrEmpty(nicknameNode.Attributes[0].Value))
         {
             SetVisiteeNickName(Language.GetStr(LanguageLabel.UI__Unnamed));
@@ -666,6 +682,26 @@ public class VisitManager : Regist
         InVisit = true;
     }
 
+    public static void ShowVisitFailPanel()
+    {
+        Bubble.Show
+        (
+            Language.GetStr(LanguageLabel.UI__C_VisitFail),
+            null,
+            null,
+            null,
+            () =>
+            {
+                ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
+                ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom0, true);
+            },
+            null,
+            false
+        );
+
+        Manager.AddCoin(VisitCost, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.VisitRefund);
+    }
+
 
     public static void SetPlayerRankPanel()
     {
@@ -677,15 +713,15 @@ public class VisitManager : Regist
     {
         SocialManager.PraiseText.text = HttpManager.PraiseAmt.ToString();
 
-        SocialManager.PraiseBtn.interactable = false;
-        SocialManager.PraiseBtn.image.color = Color.white;
+        SocialManager.PraiseButton.interactable = false;
+        SocialManager.PraiseButton.image.color = Color.white;
     }
 
     public static void SetVisiteePraise(XmlDocument document)
     {
-        SocialManager.PraiseText.text = VisiteePraise.ToString();
+        SocialManager.PraiseText.text = VisiteePraiseAmt.ToString();
         //Debug.Log(VisiteeSerialNumber);
-        HttpManager.Target
+        HttpManager.CheckIsPraised
         (
             HttpManager.SerialNumber,
             VisiteeSerialNumber,
@@ -706,7 +742,7 @@ public class VisitManager : Regist
 
     public static void SetPlayerCommentPanel()
     {
-        if (SocialManager.CommentRecordFlag)
+        if (SocialManager.OpenCommentFlag)
         {
             SocialManager.RecoverCommentPanel();
         }
@@ -718,7 +754,7 @@ public class VisitManager : Regist
 
     public static void SetVisiteeCommentPanel()
     {
-        SocialManager.ClearComment();
+        SocialManager.ClearCommentPanel();
 
         //ManaSocial.UpdatePage(false);
     }
@@ -735,40 +771,39 @@ public class VisitManager : Regist
     }
 
 
-    public static void UpdateCost()
+    public static void UpdateVisitCost()
     {
-        if (Complete)
+        if (Inited)
         {
-            Cost = Mathf.FloorToInt((float)Auxiliary.FmlParse(CostFml, "l", Manager.Level.ToString()));
+            VisitCost = Mathf.FloorToInt((float)Auxiliary.FmlParse(VisitCostFml, "l", Manager.GardenLevel.ToString()));
         }
     }
 
 
-    public static void DataReverse()
+    public static void ReverseConfigData()
     {
         if (InVisit)
         {
-            VisitPlantList = new List<Slot>(GardenManager.PlantList);
+            VisiteePlantList = new List<Slot>(GardenManager.PlantSlotList);
 
-            GardenManager.PlantList = OriginPlantList;
+            GardenManager.PlantSlotList = PlayerPlantList;
         }
     }
 
-    public static void DataRecover()
+    public static void RecoverConfigData()
     {
         if (InVisit)
         {
-            GardenManager.PlantList = VisitPlantList;
+            GardenManager.PlantSlotList = VisiteePlantList;
         }
     }
 
 
-    private static int TipAmt = 10;
 	public static void ShowTip()
 	{
 		ResourceManager.SetActive (ObjectLabel.C_Tip, true);
 
-	    string languageID = LanguageLabel.Tip + Random.Range(1, TipAmt);
+	    string languageID = LanguageLabel.Tip + Random.Range(1, MaxTipAmt);
         ResourceManager.Get<Text> (ObjectLabel.C_TipLab).text = Language.GetStr (LabelUtility.CombineLanguageLabel(LanguageLabel.Tip, languageID));
 	}
 
@@ -778,9 +813,9 @@ public class VisitManager : Regist
 	}
 
 
-    public static void Visit(ArchiveSource archiveSource, string info = null)
+    public static void Visit(ConfigSource configSource, string info = null)
     {
-        if (Manager.SceneSwitchLock)
+        if (Manager.SceneSwitchFlag)
         {
             return;
         }
@@ -790,16 +825,16 @@ public class VisitManager : Regist
         Manager.Pay
         (
             "", 
-            Cost, 
+            VisitCost, 
             Current.Coin,
             () =>
             {
                 ResourceManager.Get(ObjectLabel.I_BlackMask).GetTweenCG().Duration = 0.5f;
 
-                LoadComplete = false;
-                TweenComplete = false;
+                IsPullConfigComplete = false;
+                IsBlackMaskTweenComplete = false;
 
-                GetArchive(archiveSource, info);
+                PullConfig(configSource, info);
 
                 AudioManager.PlayClip(AudioLabel.Bubble);
 
@@ -807,7 +842,7 @@ public class VisitManager : Regist
 
                 TweenRoot tween;
 
-                if (CoolTime != 0)
+                if (VisitCDTime != 0)
                 {
                     ResourceManager.Get<Button>(ObjectLabel.C_Visit).interactable = false;
 
@@ -831,7 +866,7 @@ public class VisitManager : Regist
                     EventType.BackwardFinish,
                     () =>
                     {
-                        TweenComplete = true;
+                        IsBlackMaskTweenComplete = true;
 
                         EnterVisiteeGarden();
                     }
@@ -843,20 +878,20 @@ public class VisitManager : Regist
         );
     }
 
-    public static void GetArchive(ArchiveSource archiveSource, string info = null)
+    public static void PullConfig(ConfigSource configSource, string info = null)
     {
-        if (archiveSource == ArchiveSource.SerialNumber)
+        if (configSource == ConfigSource.SerialNumber)
         {
-            HttpManager.Other
+            HttpManager.GetTargetConfig
             (
                 info,
                 data =>
                 {
                     VisiteeSerialNumber = info;
-                    PullArchiveCallback
+                    PullConfigCallback
                     (
                         data,
-                        ShowFailPanel,
+                        ShowVisitFailPanel,
                         (jData) =>
                         {
                             XmlDocument document = new XmlDocument();
@@ -867,7 +902,7 @@ public class VisitManager : Regist
                 }
             );
         }
-        else if (archiveSource == ArchiveSource.Random)
+        else if (configSource == ConfigSource.Random)
         {
             if (UnusedDataList.Count > 0)
             {
@@ -882,12 +917,12 @@ public class VisitManager : Regist
             }
             else
             {
-                ShowFailPanel();
+                ShowVisitFailPanel();
             }
         }
     }
 
-    public static void PullArchiveCallback(JsonData jsonData, Action failed, Action<JsonData> succeed)
+    public static void PullConfigCallback(JsonData jsonData, Action failed, Action<JsonData> succeed)
     {
         if (jsonData.Inst_Object.ContainsKey("l"))
         {
@@ -901,7 +936,7 @@ public class VisitManager : Regist
         }
     }
 
-    public static void SavePulledArchive(JsonData jsonData)
+    public static void SavePulledConfig(JsonData jsonData)
     {
         //Debug.Log(jsonData.ToJson());
         XmlDocument document = new XmlDocument();
@@ -913,43 +948,7 @@ public class VisitManager : Regist
         }
     }
 
-    public static void EnterVisiteeGarden(VisitData visitData)
-    {
-        LoadComplete = true;
-        VisiteePraise = int.Parse(visitData.JsonData["p"].ToString());
-        if (visitData.JsonData.Inst_Object.ContainsKey("i"))
-        {
-            VisiteeSerialNumber = visitData.JsonData["i"].ToString();
-        }
-
-        Document = visitData.Document;
-
-        SetVisiteeCommentPanel();
-
-        EnterVisiteeGarden();
-    }
-
-    public static void ShowFailPanel()
-    {
-        Bubble.Show
-        (
-            Language.GetStr(LanguageLabel.UI__C_VisitFail),
-            null,
-            null,
-            null,
-            () =>
-            {
-                ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
-                ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom0, true);
-            },
-            null,
-            false
-        );
-
-        Manager.AddCoin(Cost, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.VisitRefund);
-    }
-
-    public static string CreateArchive()
+    public static string CreateFakeConfig()
     {
         XmlDocument doc = new XmlDocument();
 
@@ -969,13 +968,13 @@ public class VisitManager : Regist
 
             if (type == SkillType.Ability)
             {
-                Ability ability = (Ability)Manager.SkillDic[nodeList[i].Attributes[0].Value];
+                Ability ability = (Ability)Manager.SkillDictionary[nodeList[i].Attributes[0].Value];
 
                 int unlockLevel = ability.UnlockLv;
 
                 if (newLevel >= unlockLevel)
                 {
-                    if (ability.ID_ >= 6)
+                    if (ability.ID >= 6)
                     {
                         slot++;
                     }
@@ -995,7 +994,7 @@ public class VisitManager : Regist
 
         #region 随机种一些花
 
-        bool fancy = Random.Range(0f, 1f) < FancyRate; //fancy=True时 种的花比较多
+        bool fancy = Random.Range(0f, 1f) < FancyGardenRate; //fancy=True时 种的花比较多
 
         List<int> flowerList = new List<int>();
 
@@ -1031,12 +1030,12 @@ public class VisitManager : Regist
         xmlNode.Attributes[0].Value = "";
 
 
-        xmlNode.Attributes[0].Value = PlayerManager.CloseItemDic[Random.Range(2, (int)Mathf.Lerp(2, 30, newLevel / 449f) + 1)].ArmatureName;
-        xmlNode.Attributes[1].Value = PlayerManager.CloseItemDic[Random.Range(201, (int)Mathf.Lerp(201, 217, newLevel / 449f) + 1)].ArmatureName;
-        xmlNode.Attributes[2].Value = PlayerManager.CloseItemDic[Random.Range(401, (int)Mathf.Lerp(401, 415, newLevel / 449f) + 1)].ArmatureName;
-        xmlNode.Attributes[3].Value = PlayerManager.CloseItemDic[Random.Range(601, (int)Mathf.Lerp(601, 612, newLevel / 449f) + 1)].ArmatureName;
-        xmlNode.Attributes[4].Value = PlayerManager.CloseItemDic[Random.Range(801, (int)Mathf.Lerp(801, 817, newLevel / 449f) + 1)].ArmatureName;
-        xmlNode.Attributes[7].Value = PlayerManager.CloseItemDic[Random.Range(1001, (int)Mathf.Lerp(1001, 1003, newLevel / 449f) + 1)].ArmatureName;
+        xmlNode.Attributes[0].Value = PlayerManager.CloseItemDictionary[Random.Range(2, (int)Mathf.Lerp(2, 30, newLevel / 449f) + 1)].ArmatureName;
+        xmlNode.Attributes[1].Value = PlayerManager.CloseItemDictionary[Random.Range(201, (int)Mathf.Lerp(201, 217, newLevel / 449f) + 1)].ArmatureName;
+        xmlNode.Attributes[2].Value = PlayerManager.CloseItemDictionary[Random.Range(401, (int)Mathf.Lerp(401, 415, newLevel / 449f) + 1)].ArmatureName;
+        xmlNode.Attributes[3].Value = PlayerManager.CloseItemDictionary[Random.Range(601, (int)Mathf.Lerp(601, 612, newLevel / 449f) + 1)].ArmatureName;
+        xmlNode.Attributes[4].Value = PlayerManager.CloseItemDictionary[Random.Range(801, (int)Mathf.Lerp(801, 817, newLevel / 449f) + 1)].ArmatureName;
+        xmlNode.Attributes[7].Value = PlayerManager.CloseItemDictionary[Random.Range(1001, (int)Mathf.Lerp(1001, 1003, newLevel / 449f) + 1)].ArmatureName;
 
         #region 随机选一套眼睛嘴巴
 

Assets/Script/Object/ADChest.cs

@@ -26,13 +26,13 @@ public class ADChest : Chest, IPointerClickHandler
 
                         SpriteRenderer.TweenBacSr();
 
-                        IAPManager.ChestList.Remove(this);
+                        IAPManager.ADChests.Remove(this);
 
                         ResourceManager.Get(ObjectLabel.C_Group).TweenBacCG();
 
                         ResourceManager.Get(ObjectLabel.B_SignIn).TweenForCG();
 
-                        Lottery.EnterAnimation(false);
+                        Lottery.PlayAnimation(false);
                     }
                 );
             }

Assets/Script/Object/Chest.cs

@@ -80,27 +80,28 @@ public class Chest : MonoBehaviour
     public BoxCollider2D BoxCollider2D_;
     public SpriteRenderer SpriteRenderer_;
 
-    public float Timer;
-    public float SpeedY = 6f;
-    public float FreezeY;
+    public static float LiveTime = 5;
+    public float LiveTimer;
+    public float YSpeed = 6f;
+    public float YFreezePosition;
 
-
-    public static float Time = 5;
+    private float MinSpeed = 1.5f;
+    private float MaxSpeed = 3f;
 
     #endregion
 
     public void Update()
     {
-        Timer += UnityEngine.Time.deltaTime;
+        LiveTimer += UnityEngine.Time.deltaTime;
 
-        if (Timer >= Time)
+        if (LiveTimer >= LiveTime)
         {
-            Timer = 0;
+            LiveTimer = 0;
 
             Animator.SetInteger("Count", 0);
         }
 
-        if (transform.position.y <= FreezeY - 0.1f)
+        if (transform.position.y <= YFreezePosition - 0.1f)
         {
             Rigidbody.velocity = new Vector2();
 
@@ -108,10 +109,7 @@ public class Chest : MonoBehaviour
         }
     }
 
-
-    private float MinSpeed = 1.5f; 
-    private float MaxSpeed = 3f; 
-    public void Initialize(float freezY, bool forceLeft, bool forceRight)
+    public void Init(float freezY, bool forceLeft, bool forceRight)
     {
         AudioManager.PlayClip(AudioLabel.Bubble);
 
@@ -133,16 +131,16 @@ public class Chest : MonoBehaviour
             }
         }
 
-        Rigidbody.velocity = new Vector2(speedX, SpeedY);
+        Rigidbody.velocity = new Vector2(speedX, YSpeed);
 
         Rigidbody.isKinematic = false;
 
         SetCollider(true);
 
 
-        Timer = 0;
+        LiveTimer = 0;
 
-        FreezeY = freezY;
+        YFreezePosition = freezY;
 
         SpriteRenderer.GetTweenSr().InDestination = true;
 

Assets/Script/Object/CommentItem.cs

@@ -9,10 +9,10 @@ using Random = UnityEngine.Random;
 
 public class CommentItemLabel
 {
-    public static string Tit = "Tit";
-    public static string VisitLab = "VisitLab";
-    public static string VisitBtn = "VisitBtn";
-    public static string ContentLab = "ContentLab";
+    public static string Title = "Title";
+    public static string VisitButtonTitle = "VisitButtonTitle";
+    public static string VisitButton = "VisitButton";
+    public static string Content = "Content";
 }
 
 public class CommentData
@@ -60,10 +60,10 @@ public class CommentItem : Regist
 {
     #region Config
 
-    public Text Tit;
-    public Text VisitLab;
-    public Button VisitBtn;
-    public BestfitText ContentLab;
+    public Text Title;
+    public Text ContentText;
+    public Button VisitButton;
+    public BestfitText VisitButtonTitle;
 
     public string Content;
     public string SerialNumber;
@@ -81,19 +81,19 @@ public class CommentItem : Regist
 
         Auxiliary.CompileDic(transform, childDic);
 
-        Tit = childDic[CommentItemLabel.Tit].GetComponent<Text>();
-        VisitLab = childDic[CommentItemLabel.VisitLab].GetComponent<Text>();
-        VisitBtn = childDic[CommentItemLabel.VisitBtn].GetComponent<Button>();
-        ContentLab = childDic[CommentItemLabel.ContentLab].GetComponent<BestfitText>();
-        ContentLab.VerticalMaxSize = 20;
+        Title = childDic[CommentItemLabel.Title].GetComponent<Text>();
+        ContentText = childDic[CommentItemLabel.VisitButtonTitle].GetComponent<Text>();
+        VisitButton = childDic[CommentItemLabel.VisitButton].GetComponent<Button>();
+        VisitButtonTitle = childDic[CommentItemLabel.Content].GetComponent<BestfitText>();
+        VisitButtonTitle.VerticalMaxSize = 20;
 
-        VisitLab.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+        ContentText.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
 
-        VisitBtn.onClick.AddListener(Visit);
+        VisitButton.onClick.AddListener(Visit);
         
         Manager.OnLevelChange += () =>
         {
-            VisitLab.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+            ContentText.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
         };
 
         return false;
@@ -103,7 +103,7 @@ public class CommentItem : Regist
     {
         SocialManager.CloseCommentPanel();
         SocialManager.RecordCommentPanel();
-        VisitManager.Visit(ArchiveSource.SerialNumber, SerialNumber);
+        VisitManager.Visit(ConfigSource.SerialNumber, SerialNumber);
     }
 
     public void Reset(string nickname, string serialNumber, string content)
@@ -113,29 +113,29 @@ public class CommentItem : Regist
 
         if (serialNumber == HttpManager.SerialNumber)
         {
-            VisitBtn.SetActive(false);
+            VisitButton.SetActive(false);
         }
         else
         {
-            VisitBtn.SetActive(true);
+            VisitButton.SetActive(true);
         }
 
         if (!string.IsNullOrEmpty(nickname))
         {
-            Tit.text = nickname;
+            Title.text = nickname;
         }
         else
         {
-            if (Tit.text.Length >= 4)
+            if (Title.text.Length >= 4)
             {
-                Tit.text = "****" + serialNumber.Substring(serialNumber.Length - 4);
+                Title.text = "****" + serialNumber.Substring(serialNumber.Length - 4);
             }
             else
             {
-                Tit.text = "****" + Random.Range(1000, 10000);
+                Title.text = "****" + Random.Range(1000, 10000);
             }
         }
 
-        ContentLab.text = content;
+        VisitButtonTitle.text = content;
     }
 }

Assets/Script/Object/Drop.cs

@@ -8,8 +8,13 @@ public class Drop : Regist,IPointerClickHandler
 {
     #region Config
 
-    public float Timer;
+    public float LiveTime = 5;
+    public float LiveTimer;
+
     public float Speed;
+    private float MinSpeed = 3;
+    private float MaxSpeed = 5;
+
     public bool MoveLock;
 
     #endregion
@@ -46,13 +51,11 @@ public class Drop : Regist,IPointerClickHandler
         transform.SetCollider(false);
     }
 
-    private float MinSpeed = 3;
-    private float MaxSpeed = 5;
     public void ResetStatus()
     {
         MoveLock = true;
 
-        Timer = 0;
+        LiveTimer = 0;
         Speed = Random.Range(MinSpeed, MaxSpeed);
         transform.localScale = new Vector3(0.8f, 0.8f, 0.8f);
 
@@ -61,18 +64,18 @@ public class Drop : Regist,IPointerClickHandler
         transform.GetTweenSr().InOrigin = true;
     }
 
-    private float MaxLiveTime = 5;
+
     public void Update()
     {
         if (!MiniGameManager.Pause)
         {
-            Timer += Time.deltaTime;
+            LiveTimer += Time.deltaTime;
 
-            if (Timer > MaxLiveTime)
+            if (LiveTimer > LiveTime)
             {
                 Retrieve();
 
-                MiniGameManager.DropList.Remove(this);
+                MiniGameManager.DropAwardList.Remove(this);
             }
         }
 
@@ -97,6 +100,6 @@ public class Drop : Regist,IPointerClickHandler
 
         transform.SetCollider(false);
 
-        MiniGameManager.DropList.Remove(this);
+        MiniGameManager.DropAwardList.Remove(this);
     }
 }

Assets/Script/Object/DropDiamond.cs

@@ -6,15 +6,20 @@ using System.Collections.Generic;
 
 public class DropDiamond : Drop
 {
+    #region
+
     private int MinValue = 1;
     private int MaxValue = 7;
+
+    #endregion
+
     public override void OnPointerClick(PointerEventData eventData)
     {
         base.OnPointerClick(eventData);
 
         int diamond = Random.Range(MinValue, MaxValue);
 
-        Award.BonusDiamond += diamond;
+        MinigameAward.DropDiamond += diamond;
 
         ResourceManager.GetHudText($"{TransferLabel.DiamondSprite}+{diamond}", Color.white, 90, transform, ResourceManager.Get(ObjectLabel.D_HudParent), true);
     }

Assets/Script/Object/DropGold.cs

@@ -16,9 +16,9 @@ public class DropGold : Drop
     {
         base.OnPointerClick(eventData);
         
-        int coin = Mathf.CeilToInt((float) Auxiliary.FmlParse(CoinFml, "l", Mathf.Clamp(Manager.Level, 1, Mathf.Infinity).ToString(), "r", Random.Range(0f, 1f).ToString()));
+        int coin = Mathf.CeilToInt((float) Auxiliary.FmlParse(CoinFml, "l", Mathf.Clamp(Manager.GardenLevel, 1, Mathf.Infinity).ToString(), "r", Random.Range(0f, 1f).ToString()));
 
-        Award.BonusCoin += coin;
+        MinigameAward.DropCoin += coin;
 
         ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, transform, ResourceManager.Get(ObjectLabel.D_HudParent), true);
     }

Assets/Script/Object/Elf.cs

@@ -7,17 +7,17 @@ public class Elf : Regist
 {
 	#region Config
 
-    public Flower Flower;
+    public Flower ParentFlower;
     public Animator Animator;
-    public Transform Root;
+    public Transform ElfRoot;
 
     #endregion
 
     public void Save()
     {
-        Flower.ElfList.Remove(Root);
+        ParentFlower.ElfList.Remove(ElfRoot);
 
-        ResourceManager.Save(Root);
+        ResourceManager.Save(ElfRoot);
     }
 
 
@@ -28,7 +28,7 @@ public class Elf : Regist
             return true;
         }
 
-        Root = transform.parent;
+        ElfRoot = transform.parent;
         Animator = GetComponent<Animator>();
 
         return false;

Assets/Script/Object/Flower.cs

@@ -20,21 +20,21 @@ public enum OpType
 
 public class FlowerLabel
 {
-    public static string GoldBk = "GoldBk";
-    public static string GoldIcon = "GoldIcon";
+    public static string AwardGoldBk = "AwardGoldBk";
+    public static string AwardGoldIcon = "AwardGoldIcon";
+    public static string AwardGoldPos = "AwardGoldPos";
     public static string FlashLight = "FlashLight";
     public static string FlowerIcon = "FlowerIcon";
-    public static string OperateBk = "OperateBk";
+    public static string OperatePanelBk = "OperatePanelBk";
     public static string OperateIcon = "OperateIcon";
-    public static string OperateOutline1 = "OperateOutline1";
+    public static string OperateOutlineParent = "OperateOutlineParent";
     public static string NewFlowerEffect = "NewFlowerEffect";
     public static string FlowerShadow = "FlowerShadow";
-    public static string ScorePosTra = "ScorePosTra";
-    public static string MiniGame = "MiniGame";
+    public static string ScorePos = "ScorePos";
+    public static string MiniGamePanel = "MiniGamePanel";
     public static string Flash = "Flash";
-    public static string ParticleSystem = "Particle System";
-    public static string GoldPosTra = "GoldPosTra";
-    public static string GoldBKPosLeft = "GoldBKPosLeft";
+    public static string ParticleSystem = "ParticleSystem";
+    public static string AwardGoldBkLeftPos = "AwardGoldBkLeftPos";
 }
 
 public class FlowerInfo
@@ -48,47 +48,50 @@ public class FlowerInfo
         {
             amount = value;
 
-            AmountLab.SetActive(true);
+            AmountText.SetActive(true);
 
-            AmountLab.text = AmountTextPrefix + amount;
+            AmountText.text = AmountTextPrefix + amount;
         }
     }
     public int amount;
+
     public int RemainAmount
     {
         get { return Amount - PlantAmt; }
     }
+
     public int PlantAmt;
 
-    public bool Plant
+    public bool IsPlanted
     {
         get { return PlantAmt > 0; }
     }
+
     public bool Unlock
     {
-        get { return Unlock_; }
+        get { return unlock; }
         set
         {
-            Unlock_ = value;
+            unlock = value;
 
-            if (Unlock_)
+            if (unlock)
             {
                 Image.material = null;
 
-                if (Special)
+                if (IsSpecial)
                 {
-                    if (GardenManager.MyFlowerSpec == 0)
+                    if (GardenManager.TotalUnlockSpecialFlower == 0)
                     {
                         ResourceManager.Get(ObjectLabel.G_Regular).TweenForVec();
 
                         ResourceManager.SetActive(ObjectLabel.G_Special, true);
                     }
 
-                    GardenManager.MyFlowerSpec++;
+                    GardenManager.TotalUnlockSpecialFlower++;
                 }
                 else
                 {
-                    GardenManager.MyFlowerRegu++;
+                    GardenManager.TotalUnlockNormalFlower++;
                 }
 
                 Amount = 1;
@@ -96,8 +99,10 @@ public class FlowerInfo
             }
         }
     }
-    private float SkillPlus = 0.1f;
+    public bool unlock;
 
+    public bool IsSpecial;
+    public float SkillPlus = 0.1f;
     public static string IDPrefix = "Flower";
     public static string AmountTextPrefix = "x";
 
@@ -105,9 +110,11 @@ public class FlowerInfo
     {
         get
         {
-            return IDPrefix + ID_;
+            return IDPrefix + ID;
         }
     }
+    public int ID;
+
     public string Name
     {
         get
@@ -122,21 +129,16 @@ public class FlowerInfo
 
     public Sprite Icon
     {
-        get { return ResourceManager.LoadSprite(Icon_, Folder.Atlas2); }
+        get { return ResourceManager.LoadSprite(icon, Folder.Atlas2); }
     }
+    public string icon;
 
-    public int ID_;
-    public bool Unlock_;
-    public string Icon_;
-
-    public bool Special;
-
-    public int UnlockAmt;
-    public float FlowerCoinBuff;
+    public int UnlockCost;
+    public float AwardCoinBuff;
     public Current UnlockCur;
 
-    public Text Text;
-    public Text AmountLab;
+    public Text StatusText;
+    public Text AmountText;
     public Image Image;
     public Button Button;
     public UIPartical UIPartical;
@@ -154,18 +156,18 @@ public class FlowerInfo
 
         Auxiliary.CompileDic(FlowerItem, ChildDic);
 
-        Text = ChildDic[FlowerItemLabel.Lab].GetComponent<Text>();
+        StatusText = ChildDic[FlowerItemLabel.Status].GetComponent<Text>();
         Image = ChildDic[FlowerItemLabel.Icon].GetComponent<Image>();
         Button = ChildDic[FlowerItemLabel.FlowerItem].GetComponent<Button>();
         UIPartical = ChildDic[FlowerItemLabel.UIParticleSystem].GetComponent<UIPartical>();
-        AmountLab = ChildDic[FlowerItemLabel.AmtLab].GetComponent<Text>();
+        AmountText = ChildDic[FlowerItemLabel.Amount].GetComponent<Text>();
 
-        ID_ = int.Parse(attribute[0].Value);
-        Icon_ = attribute[5].Value;
+        ID = int.Parse(attribute[0].Value);
+        icon = attribute[5].Value;
 
         UnlockCur = Auxiliary.CurrentParse(attribute[3].Value);
-        UnlockAmt = Auxiliary.StringToInt(attribute[4].Value, 0);
-        FlowerCoinBuff = Auxiliary.StringToFloat(attribute[7].Value, 1);
+        UnlockCost = Auxiliary.StringToInt(attribute[4].Value, 0);
+        AwardCoinBuff = Auxiliary.StringToFloat(attribute[7].Value, 1);
 
         Image.sprite = Icon;
 
@@ -175,7 +177,7 @@ public class FlowerInfo
         (
             () =>
             {
-                if (Plant)
+                if (IsPlanted)
                 {
                     AudioManager.PlayClip(AudioLabel.ClickButton);
 
@@ -208,45 +210,44 @@ public class Flower : Regist, IPointerClickHandler
 
     #region MiniGame
 
-    public OpType OpType
+    public OpType PunchGameOperateType
     {
-        get { return OpType_; }
+        get { return punchGameOperateType; }
         set
         {
-            OpType_ = value;
+            punchGameOperateType = value;
 
-            if (OpType_ == OpType.Rip)
+            if (punchGameOperateType == OpType.Rip)
             {
                 OperateIcon.sprite = RipSprite;
             }
-            else if (OpType_ == OpType.Water)
+            else if (punchGameOperateType == OpType.Water)
             {
                 OperateIcon.sprite = WaterSprite;
             }
-            else if (OpType_ == OpType.Fertilize)
+            else if (punchGameOperateType == OpType.Fertilize)
             {
                 OperateIcon.sprite = FertilizeSprite;
             }
         }
     }
-
-    public OpType OpType_;
+    public OpType punchGameOperateType;
 
     public SpriteRenderer FlowerIcon;
-    public SpriteRenderer OperateBk;
+    public SpriteRenderer OperatePanelBk;
     public SpriteRenderer OperateIcon;
-    public SpriteRenderer OperateOutline;
+    public SpriteRenderer OperateOutlineParent;
 
     #endregion
 
-    public bool Award
+    public bool HaveAward
     {
-        get { return Award_; }
+        get { return haveAward; }
         set
         {
-            Award_ = value;
+            haveAward = value;
 
-            if (Award_)
+            if (haveAward)
             {
                 ShowAward();
             }
@@ -256,6 +257,8 @@ public class Flower : Regist, IPointerClickHandler
             }
         }
     }
+    public bool haveAward;
+
     public Sprite RipSprite
     {
         get
@@ -277,147 +280,83 @@ public class Flower : Regist, IPointerClickHandler
             return ResourceManager.LoadSprite(ResourceLabel.Fertilize, Folder.UI);
         }
     }
+
     public FlowerInfo FlowerInfo
     {
-        get { return FlowerInfo_; }
+        get { return flowerInfo; }
         set
         {
-            FlowerInfo_ = value;
+            flowerInfo = value;
 
-            ID = FlowerInfo.ID_;
+            ID = FlowerInfo.ID;
             FlowerIcon.sprite = FlowerInfo.Icon;
         }
     }
-    public SpriteRenderer ShadowSr;
+    private FlowerInfo flowerInfo;
 
-    public bool Award_;
-    private FlowerInfo FlowerInfo_;
+    public SpriteRenderer ShadowSR;
 
     public int ID;
-
     public Slot Slot;
     public Animator FlashLightAC;
-
-    public Transform GoldBk;
-    public Transform GoldIcon;
+    public Transform AwardGoldBk;
+    public Transform AwardGoldIcon;
     public MaterialUnit NewFlowerEffectMatUnit;
-    protected ParticleSystem NewFlowerEffect;
+    public ParticleSystem NewFlowerEffect;
 
     public List<Transform> ElfList = new List<Transform>();
-
     public Dictionary<string, Transform> ChildDic = new Dictionary<string, Transform>();
 
-
-    public static string FlowerCoinFml;
+    public static string AwardCoinFml;
 
     #endregion
 
-    public override bool InitAtOnce()
-    {
-        if (base.InitAtOnce())
-        {
-            return true;
-        }
-
-        enabled = true;
-
-        Auxiliary.CompileDic(transform, ChildDic);
-
-        GoldBk = ChildDic[FlowerLabel.GoldBk];
-        GoldIcon = ChildDic[FlowerLabel.GoldIcon];
-        FlashLightAC = ChildDic[FlowerLabel.FlashLight].GetComponent<Animator>();
-        FlowerIcon = ChildDic[FlowerLabel.FlowerIcon].GetComponent<SpriteRenderer>();
-        OperateBk = ChildDic[FlowerLabel.OperateBk].GetComponent<SpriteRenderer>();
-        OperateIcon = ChildDic[FlowerLabel.OperateIcon].GetComponent<SpriteRenderer>();
-        OperateOutline = ChildDic[FlowerLabel.OperateOutline1].GetComponent<SpriteRenderer>();
-        NewFlowerEffect = ChildDic[FlowerLabel.NewFlowerEffect].GetComponent<ParticleSystem>();
-        ShadowSr = ChildDic[FlowerLabel.FlowerShadow].GetComponent<SpriteRenderer>();
-
-        GoldBk.CreateTweenSr(0, 1, 1f, false, true, Curve.EaseOutQuad);
-        GoldIcon.CreateTweenSr(0, 1, 1f, false, true, Curve.EaseOutQuad);
-
-
-        #region 新花粒子特效
-
-        Renderer renderer = NewFlowerEffect.GetComponent<Renderer>();
-
-        Material material = new Material(renderer.material);
-
-        renderer.material = material;
-
-        NewFlowerEffectMatUnit = new MaterialUnit(material, NewFlowerEffect.transform, new List<string>() { "_Alpha" });
-
-        NewFlowerEffectMatUnit.CreateTweenMatFloat(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
-
-        #endregion
-
-        TweenRoot tween = OperateBk.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.2f, true, true, Curve.EaseOutQuad, false, true);
-
-        tween.OnForwardFinish += () =>
-        {
-            OperateBk.TweenBacSr();
-        };
-
-        tween = OperateBk.CreateTweenScale(OperateBk.transform.localScale + new Vector3(0.1f, 0.1f, 0.1f), 0.25f, false, true, Curve.EaseOutQuad);
-
-        tween.OnBackwardFinish += () =>
-        {
-            if (OpType != OpType.Null)
-            {
-                OperateBk.SetActive(true);
-            }
-        };
-
-        return false;
-    }
-
-
     #region MiniGame
 
     public void GameOver()
     {
-        OpType = OpType.Null;
+        PunchGameOperateType = OpType.Null;
 
-        ChildDic[FlowerLabel.MiniGame].SetActive(false);
+        ChildDic[FlowerLabel.MiniGamePanel].SetActive(false);
 
-        OperateBk.TweenBacScale();
+        OperatePanelBk.TweenBacScale();
     }
 
     public void GameBegin()
     {
-        ChildDic[FlowerLabel.MiniGame].SetActive(true);
+        ChildDic[FlowerLabel.MiniGamePanel].SetActive(true);
 
-        OperateBk.SetActive(false);
+        OperatePanelBk.SetActive(false);
     }
 
 
     public void SetFirstOp()
     {
-        OperateBk.TweenForScale();
+        OperatePanelBk.TweenForScale();
 
         OperateIcon.SetAlpha(1);
-        OperateOutline.SetAlpha(1);
+        OperateOutlineParent.SetAlpha(1);
 
         OperateIcon.SetActive(true);
-        OperateOutline.SetActive(true);
+        OperateOutlineParent.SetActive(true);
     }
 
     public void SetThirdOp()
     {
         OperateIcon.SetAlpha(0.5f);
-        OperateOutline.SetAlpha(0.5f);
+        OperateOutlineParent.SetAlpha(0.5f);
 
         OperateIcon.SetActive(true);
-        OperateOutline.SetActive(false);
+        OperateOutlineParent.SetActive(false);
     }
 
     public void SetSecondOp()
     {
         OperateIcon.SetAlpha(1);
-        OperateOutline.SetAlpha(1);
+        OperateOutlineParent.SetAlpha(1);
 
         OperateIcon.SetActive(true);
-        OperateOutline.SetActive(false);
+        OperateOutlineParent.SetActive(false);
     }
 
 
@@ -425,19 +364,19 @@ public class Flower : Regist, IPointerClickHandler
     {
         float random = Random.Range(0f, 1f);
 
-        OperateBk.SetActive(true);
+        OperatePanelBk.SetActive(true);
 
         if (random <= 0.3333333f)
         {
-            OpType = OpType.Rip;
+            PunchGameOperateType = OpType.Rip;
         }
         else if (random <= 0.6666666f)
         {
-            OpType = OpType.Water;
+            PunchGameOperateType = OpType.Water;
         }
         else
         {
-            OpType = OpType.Fertilize;
+            PunchGameOperateType = OpType.Fertilize;
         }
 
         if (sequence == 0)
@@ -456,8 +395,8 @@ public class Flower : Regist, IPointerClickHandler
 
     public void CreateOp(int sequence, OpType opType)
     {
-        OpType = opType;
-        OperateBk.SetActive(true);
+        PunchGameOperateType = opType;
+        OperatePanelBk.SetActive(true);
 
         if (sequence == 0)
         {
@@ -474,7 +413,6 @@ public class Flower : Regist, IPointerClickHandler
     }
 
 
-    private int PunchScore = 15;
     public bool Operate(OpType opType)
     {
         if (opType == OpType.Rip)
@@ -490,7 +428,7 @@ public class Flower : Regist, IPointerClickHandler
             ResourceManager.Get(ObjectLabel.D_Fertilize2).TweenForScale();
         }
 
-        if (opType != OpType)
+        if (opType != PunchGameOperateType)
         {
             TweenRoot tween = FlowerIcon.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.2f, true, true, Curve.EaseOutQuad, false, true);
 
@@ -499,7 +437,7 @@ public class Flower : Regist, IPointerClickHandler
                 FlowerIcon.TweenBacSr();
             };
 
-            OperateBk.TweenForSr();
+            OperatePanelBk.TweenForSr();
             FlowerIcon.TweenForSr();
 
             OperateIcon.Shake(0.5f, 3, new Vector3(0.2f, 0, 0), Curve.EaseOutQuad);
@@ -510,19 +448,19 @@ public class Flower : Regist, IPointerClickHandler
         }
         else
         {
-            ResourceManager.GetHudText($"+{PunchScore}", Color.white, 90, ChildDic[FlowerLabel.ScorePosTra], ResourceManager.Get(ObjectLabel.D_HudParent), true);
+            ResourceManager.GetHudText($"+{MiniGameManager.PunchCorrectScore}", Color.white, 90, ChildDic[FlowerLabel.ScorePos], ResourceManager.Get(ObjectLabel.D_HudParent), true);
 
-            MiniGameManager.Score += PunchScore;
+            MiniGameManager.Score += MiniGameManager.PunchCorrectScore;
 
             PlayFlashLight();
 
-            OpType = OpType.Null;
+            PunchGameOperateType = OpType.Null;
 
-            OperateBk.TweenBacScale();
+            OperatePanelBk.TweenBacScale();
 
-            OperateBk.SetActive(false);
+            OperatePanelBk.SetActive(false);
             OperateIcon.SetActive(false);
-            OperateOutline.SetActive(false);
+            OperateOutlineParent.SetActive(false);
 
             AudioManager.PlayClip(AudioLabel.ClickButton);
 
@@ -532,13 +470,72 @@ public class Flower : Regist, IPointerClickHandler
 
     #endregion
 
+    public override bool InitAtOnce()
+    {
+        if (base.InitAtOnce())
+        {
+            return true;
+        }
+
+        enabled = true;
+
+        Auxiliary.CompileDic(transform, ChildDic);
+
+        AwardGoldBk = ChildDic[FlowerLabel.AwardGoldBk];
+        AwardGoldIcon = ChildDic[FlowerLabel.AwardGoldIcon];
+        FlashLightAC = ChildDic[FlowerLabel.FlashLight].GetComponent<Animator>();
+        FlowerIcon = ChildDic[FlowerLabel.FlowerIcon].GetComponent<SpriteRenderer>();
+        OperatePanelBk = ChildDic[FlowerLabel.OperatePanelBk].GetComponent<SpriteRenderer>();
+        OperateIcon = ChildDic[FlowerLabel.OperateIcon].GetComponent<SpriteRenderer>();
+        OperateOutlineParent = ChildDic[FlowerLabel.OperateOutlineParent].GetComponent<SpriteRenderer>();
+        NewFlowerEffect = ChildDic[FlowerLabel.NewFlowerEffect].GetComponent<ParticleSystem>();
+        ShadowSR = ChildDic[FlowerLabel.FlowerShadow].GetComponent<SpriteRenderer>();
+
+        AwardGoldBk.CreateTweenSr(0, 1, 1f, false, true, Curve.EaseOutQuad);
+        AwardGoldIcon.CreateTweenSr(0, 1, 1f, false, true, Curve.EaseOutQuad);
+
+
+        #region 新花粒子特效
+
+        Renderer renderer = NewFlowerEffect.GetComponent<Renderer>();
+
+        Material material = new Material(renderer.material);
+
+        renderer.material = material;
+
+        NewFlowerEffectMatUnit = new MaterialUnit(material, NewFlowerEffect.transform, new List<string>() { "_Alpha" });
+
+        NewFlowerEffectMatUnit.CreateTweenMatFloat(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        #endregion
+
+        TweenRoot tween = OperatePanelBk.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.2f, true, true, Curve.EaseOutQuad, false, true);
+
+        tween.OnForwardFinish += () =>
+        {
+            OperatePanelBk.TweenBacSr();
+        };
+
+        tween = OperatePanelBk.CreateTweenScale(OperatePanelBk.transform.localScale + new Vector3(0.1f, 0.1f, 0.1f), 0.25f, false, true, Curve.EaseOutQuad);
+
+        tween.OnBackwardFinish += () =>
+        {
+            if (PunchGameOperateType != OpType.Null)
+            {
+                OperatePanelBk.SetActive(true);
+            }
+        };
+
+        return false;
+    }
+
 
     public void GetElf(ElfType elfType, float xMin = -0.75f, float xMax = 0.75f, float yMin = 0, float yMax = 0.75f)
     {
         ElfList.Add(ResourceManager.GetElf(this, new Vector4(xMin, xMax, yMin, yMax), elfType));
     }
 
-    public void Retrieve()
+    public void RetrieveFlower()
     {
         ChildDic[FlowerLabel.Flash].SetActive(false);
         ChildDic[FlowerLabel.ParticleSystem].SetActive(false);
@@ -546,7 +543,7 @@ public class Flower : Regist, IPointerClickHandler
         FlowerInfo.ChildDic[FlowerItemLabel.UIFlash].SetActive(false);
         FlowerInfo.ChildDic[FlowerItemLabel.UIParticleSystem].SetActive(false);
 
-        ShadowSr.SetAlpha(1);
+        ShadowSR.SetAlpha(1);
 
         StopNewFlowerEffec();
 
@@ -554,7 +551,7 @@ public class Flower : Regist, IPointerClickHandler
 
         RetrieveElf();
 
-        Award_ = false;
+        haveAward = false;
 
         ResetAward();
     }
@@ -584,12 +581,6 @@ public class Flower : Regist, IPointerClickHandler
         NewFlowerEffectMatUnit.TweenBacMatFloat();
     }
 
-    public void SetShadow()
-    {
-        //ShadowSr.transform.SetLX((FlowerIcon.sprite.pivot.x - 0.5f)*FlowerIcon.sprite.rect.width/100);
-        //ShadowSr.transform.SetLY((FlowerIcon.sprite.pivot.y - 0.5f)*FlowerIcon.sprite.rect.height/100);
-    }
-
 
     public void GetAward()
     {
@@ -600,18 +591,18 @@ public class Flower : Regist, IPointerClickHandler
         int coin;
         if (VisitManager.InVisit)
         {
-            int awardMin = Mathf.CeilToInt((float)Auxiliary.FmlParse(VisitManager.AwardMinFml, "l", Manager.Level.ToString()));
-            int awardMax = Mathf.CeilToInt((float)Auxiliary.FmlParse(VisitManager.AwardMaxFml, "l", Manager.Level.ToString()));
+            int awardMin = Mathf.CeilToInt((float)Auxiliary.FmlParse(VisitManager.AwardMinFml, "l", Manager.GardenLevel.ToString()));
+            int awardMax = Mathf.CeilToInt((float)Auxiliary.FmlParse(VisitManager.AwardMaxFml, "l", Manager.GardenLevel.ToString()));
             coin = Mathf.CeilToInt(Mathf.Lerp(awardMin, awardMax, Random.Range(0f, 1f)));
         }
         else
         {
 
-            coin = Mathf.CeilToInt((float)Auxiliary.FmlParse(FlowerCoinFml, "l", Mathf.Clamp(Manager.Level, 1, Mathf.Infinity).ToString()) * FlowerInfo.FlowerCoinBuff);
-            Manager.FlowerCoin++;
+            coin = Mathf.CeilToInt((float)Auxiliary.FmlParse(AwardCoinFml, "l", Mathf.Clamp(Manager.GardenLevel, 1, Mathf.Infinity).ToString()) * FlowerInfo.AwardCoinBuff);
+            Manager.TotalFlowerAwardCoin++;
         }
 
-        Transform flyGold = ResourceManager.Get(ResourceLabel.FlyGold, Folder.Scene, false, null, GoldIcon.position, ObjType.FlyGold);
+        Transform flyGold = ResourceManager.Get(ResourceLabel.FlyGold, Folder.Scene, false, null, AwardGoldIcon.position, ObjType.FlyGold);
         TweenRoot tweenRoot = flyGold.GetTweenSr();
         if (tweenRoot == null)
         {
@@ -643,33 +634,33 @@ public class Flower : Regist, IPointerClickHandler
             }
         );
 
-        ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, ChildDic[FlowerLabel.GoldPosTra], ResourceManager.Get(ObjectLabel.A_HudParent), true);
+        ResourceManager.GetHudText($"{TransferLabel.CoinSprite}+{coin}", Color.white, 90, ChildDic[FlowerLabel.AwardGoldPos], ResourceManager.Get(ObjectLabel.A_HudParent), true);
 
         ResetAward();
     }
 
     public void ResetAward()
     {
-        GoldBk.SetActive(false);
+        AwardGoldBk.SetActive(false);
 
-        GoldBk.GetTweenSr().Pause();
-        GoldIcon.GetTweenSr().Pause();
+        AwardGoldBk.GetTweenSr().Pause();
+        AwardGoldIcon.GetTweenSr().Pause();
 
-        GoldBk.GetTweenSr().InOrigin = true;
-        GoldIcon.GetTweenSr().InOrigin = true;
+        AwardGoldBk.GetTweenSr().InOrigin = true;
+        AwardGoldIcon.GetTweenSr().InOrigin = true;
     }
 
     public void ShowAward()
     {
-        GoldBk.SetX(ChildDic[FlowerLabel.GoldBKPosLeft].position.x);
-        GoldBk.GetComponent<SpriteRenderer>().flipX = true;
+        AwardGoldBk.SetX(ChildDic[FlowerLabel.AwardGoldBkLeftPos].position.x);
+        AwardGoldBk.GetComponent<SpriteRenderer>().flipX = true;
 
-        GoldBk.SetY(transform.position.y + 2.5f);
+        AwardGoldBk.SetY(transform.position.y + 2.5f);
 
-        GoldBk.TweenReForSr();
-        GoldIcon.TweenReForSr();
+        AwardGoldBk.TweenReForSr();
+        AwardGoldIcon.TweenReForSr();
 
-        GoldBk.MoveOffset2D
+        AwardGoldBk.MoveOffset2D
         (
             new Vector3(0, 0.5f, 0),
             1f,
@@ -692,9 +683,9 @@ public class Flower : Regist, IPointerClickHandler
 
             GardenManager.ShowRetrieveCard(FlowerInfo, Slot);
         }
-        else if (eventData.rawPointerPress.transform == GoldBk)
+        else if (eventData.rawPointerPress.transform == AwardGoldBk)
         {
-            Award = false;
+            HaveAward = false;
         }
     }
 

Assets/Script/Object/FlowerItem.cs

@@ -5,12 +5,12 @@ using System.Collections.Generic;
 
 public class FlowerItemLabel
 {
-    public static string Arrow0 = "Arrow0";
-    public static string Lab = "Lab";
+    public static string ArrowPos = "ArrowPos";
+    public static string Status = "Status";
     public static string Icon = "Icon";
     public static string FlowerItem = "FlowerItem";
-    public static string UIParticleSystem = "UIParticle System";
-    public static string AmtLab = "AmtLab";
+    public static string UIParticleSystem = "UIParticleSystem";
+    public static string Amount = "Amount";
     public static string UIFlash = "UIFlash";
 }
 

Assets/Script/Object/Garden.cs

@@ -16,19 +16,19 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 {
     #region Config
 
-    public static int Page
+    public static int TotalPage
     {
         get
         {
-            return GardenManager.PageList.Count - 1;
+            return GardenManager.SlotPageList.Count - 1;
         }
     }
 
-    public static int CurPage;
+    public static int CurrentPage;
 
-    public static bool Flag1 = true;
-    public static bool Flag2 = true;
-    public static float SlideSensi = 0.1f;
+    public static bool MoveFlag1 = true;
+    public static bool MoveFlag2 = true;
+    public static float SlideSpeed = 0.1f;
 
     public static float BK2MoveRatio = 0.25f;
     public static float BK3MoveRatio = 0.5f;
@@ -114,7 +114,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         #region GardenMini
 
-        ResourceManager.Get(GardenLabel.GardenMini).CreateTweenVec2D
+        ResourceManager.Get(GardenLabel.Minigame).CreateTweenVec2D
         (
             ResourceManager.Get(GardenLabel.MinigameLeftPos).position,
             0.5f,
@@ -134,12 +134,12 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         move2D.OnForwardStart += () =>
         {
-            Flag2 = false;
+            MoveFlag2 = false;
         };
 
         move2D.OnForwardFinish += () =>
         {
-            Flag2 = true;
+            MoveFlag2 = true;
         };
 
         #endregion
@@ -185,7 +185,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
     public void OnDrag(PointerEventData eventData)
     {
-        if (Flag1 && Flag2)
+        if (MoveFlag1 && MoveFlag2)
         {
             if (Direction == Direction.Null)
             {
@@ -211,17 +211,17 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
                     float rawDeltaX = eventData.position.x - eventData.pressPosition.x;
 
-                    if (CurPage < Page - 1)
+                    if (CurrentPage < TotalPage - 1)
                     {
                         float tempX = Mathf.Clamp(eventData.delta.x / 10, -2, 2);
 
-                        if (Page == 1)
+                        if (TotalPage == 1)
                         {
-                            tempX *= SlideSensi;
+                            tempX *= SlideSpeed;
                         }
                         else
                         {
-                            tempX *= SlideSensi / (Page - 1);
+                            tempX *= SlideSpeed / (TotalPage - 1);
                         }
 
                         Player.Translate(Player.right * tempX * PlayerMoveRatio, Space.World);
@@ -240,7 +240,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
                     {
                         float ratio = Mathf.Abs(GardenPage.position.x - PagePos.Back(1).x)/0.7f;
 
-                        float sensi = Mathf.Lerp(SlideSensi, 0, ratio);
+                        float sensi = Mathf.Lerp(SlideSpeed, 0, ratio);
 
                         float tempX = Mathf.Clamp(eventData.delta.x / 10, -2, 2) * sensi;
 
@@ -262,17 +262,17 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
                     float rawDeltaX = eventData.position.x - eventData.pressPosition.x;
 
-                    if (CurPage > 0)
+                    if (CurrentPage > 0)
                     {
                         float tempX = Mathf.Clamp(eventData.delta.x / 10, -2, 2);
 
-                        if (Page == 1)
+                        if (TotalPage == 1)
                         {
-                            tempX *= SlideSensi;
+                            tempX *= SlideSpeed;
                         }
                         else
                         {
-                            tempX *= SlideSensi / (Page - 1);
+                            tempX *= SlideSpeed / (TotalPage - 1);
                         }
 
                         Player.Translate(Player.right * tempX * PlayerMoveRatio, Space.World);
@@ -291,7 +291,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
                     {
                         float ratio = Mathf.Abs(GardenPage.position.x - PagePos[0].x) / 0.7f;
 
-                        float sensi = Mathf.Lerp(SlideSensi, 0, ratio);
+                        float sensi = Mathf.Lerp(SlideSpeed, 0, ratio);
 
                         float tempX = Mathf.Clamp(eventData.delta.x / 10, -2, 2) * sensi;
 
@@ -306,12 +306,12 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
     public void OnEndDrag(PointerEventData eventData)
     {
-        if (Flag1 && Flag2)
+        if (MoveFlag1 && MoveFlag2)
         {
             Return();
         }
 
-        Flag1 = true;
+        MoveFlag1 = true;
 
         Direction = Direction.Null;
     }
@@ -351,17 +351,17 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
     public static void Return()
     {
-        Flag1 = false;
+        MoveFlag1 = false;
 
         float ratio;
 
-        if (Page == 1)
+        if (TotalPage == 1)
         {
             ratio = 0;
         }
         else
         {
-            ratio = CurPage / (Page - 1f);
+            ratio = CurrentPage / (TotalPage - 1f);
         }
 
         Vector3 playerPos = Vector3.Lerp(PlayerPos[0], PlayerPos[1], ratio);
@@ -375,16 +375,16 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
         GardenBK3.Move2D(gardenPos3, 0.5f, false, Curve.EaseOutQuad);
         GardenBK4.Move2D(gardenPos4, 0.5f, false, Curve.EaseOutQuad);
 
-        GardenPage.Move2D(PagePos[CurPage], 0.5f, false, Curve.EaseOutQuad);
+        GardenPage.Move2D(PagePos[CurrentPage], 0.5f, false, Curve.EaseOutQuad);
     }
 
     public static void PrevPage()
     {
-        CurPage--;
+        CurrentPage--;
 
-        Flag1 = false;
+        MoveFlag1 = false;
 
-        float ratio = CurPage / (Page - 1f);
+        float ratio = CurrentPage / (TotalPage - 1f);
 
         Vector3 playerPos = Vector3.Lerp(PlayerPos[0], PlayerPos[1], ratio);
         Vector3 gardenPos2 = Vector3.Lerp(GardenBK2Pos[0], GardenBK2Pos[1], ratio);
@@ -397,16 +397,16 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
         GardenBK3.Move2D(gardenPos3, 0.5f, false, Curve.EaseOutQuad);
         GardenBK4.Move2D(gardenPos4, 0.5f, false, Curve.EaseOutQuad);
 
-        GardenPage.Move2D(PagePos[CurPage], 0.5f, false, Curve.EaseOutQuad);
+        GardenPage.Move2D(PagePos[CurrentPage], 0.5f, false, Curve.EaseOutQuad);
     }
 
     public static void NextPage()
     {
-        CurPage++;
+        CurrentPage++;
 
-        Flag1 = false;
+        MoveFlag1 = false;
 
-        float ratio = CurPage / (Page - 1f);
+        float ratio = CurrentPage / (TotalPage - 1f);
 
         Vector3 playerPos = Vector3.Lerp(PlayerPos[0], PlayerPos[1], ratio);
         Vector3 gardenPos2 = Vector3.Lerp(GardenBK2Pos[0], GardenBK2Pos[1], ratio);
@@ -419,12 +419,12 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
         GardenBK3.Move2D(gardenPos3, 0.5f, false, Curve.EaseOutQuad);
         GardenBK4.Move2D(gardenPos4, 0.5f, false, Curve.EaseOutQuad);
 
-        GardenPage.Move2D(PagePos[CurPage], 0.5f, false, Curve.EaseOutQuad);
+        GardenPage.Move2D(PagePos[CurrentPage], 0.5f, false, Curve.EaseOutQuad);
     }
 
     public static void ResetPage()
     {
-        CurPage = 0;
+        CurrentPage = 0;
 
         GardenBK2.position = GardenBK2Pos[0];
         GardenBK3.position = GardenBK3Pos[0];

Assets/Script/Object/Player.cs

@@ -16,7 +16,6 @@ using Transform = UnityEngine.Transform;
 
 public class PlayerLabel
 {
-    
     public static string MessageBox = "MessageBox";
     public static string NickName = "NickName";
     public static string Pivot = "Pivot";
@@ -51,7 +50,7 @@ public enum BodyPart
 
 public class ExchangeInfo
 {
-    public float Rate;
+    public float ExchangeRate;
     public double Value;
     public Current Current;
 
@@ -70,7 +69,7 @@ public class ExchangeInfo
     public static ExchangeInfo GetExchangeInfo(Current current, double amt, float rate)
     {
         ExchangeInfo info = new ExchangeInfo();
-        info.Rate = rate;
+        info.ExchangeRate = rate;
         info.Value = amt * rate;
         info.Current = current;
         return info;
@@ -99,7 +98,7 @@ public class CloseItem
         Shoe,
     }
 
-    #region Var
+    #region Config
 
     public string Name
     {
@@ -107,15 +106,17 @@ public class CloseItem
     }
 
     public static string IDPrefix = "Armature";
+
     public string FullID
     {
-        get { return IDPrefix + id; }
+        get { return IDPrefix + ID; }
     }
-    public int id;
+    public int ID;
+
     public int Index;
     public int BuyLevel;
     public int PixelSize;
-    public bool Possess;
+    public bool IsBought;
     public string ArmatureName;
 
     public string[] ExtraArmatureNames;
@@ -135,10 +136,10 @@ public class CloseItem
     public BodyPart BodyPart;
     public Transform Transform;
     public CloseType Type;
-    public bool Ignore;
+    public bool Unavailable; //True-不显示
 
-    public double BuyAmt;
-    public double BuyAdvanceAmt;
+    public double BuyCost;
+    public double BuyAdvanceCost;
     public Current BuyCurrent;
     public Current BuyAdvanceCurrent;
 
@@ -148,16 +149,16 @@ public class CloseItem
 
     public CloseItem(XmlAttributeCollection attribute)
     {
-        Ignore = Auxiliary.StringToBool(attribute[19].Value, false);
+        Unavailable = Auxiliary.StringToBool(attribute[19].Value, false);
 
-        id = Auxiliary.StringToInt(attribute[0].Value, -1);
+        ID = Auxiliary.StringToInt(attribute[0].Value, -1);
         BodyPart = BodyPartParse(attribute[4].Value);
         ArmatureName = attribute[16].Value;
 
-        PlayerManager.CloseIDDic.Add(ArmatureName, id);
-        PlayerManager.CloseItemDic.Add(id, this);
+        PlayerManager.CloseIDDictionary.Add(ArmatureName, ID);
+        PlayerManager.CloseItemDictionary.Add(ID, this);
 
-        if (Ignore)
+        if (Unavailable)
         {
             return;
         }
@@ -166,9 +167,9 @@ public class CloseItem
         Index = Auxiliary.StringToInt(attribute[3].Value, -1);
         BuyLevel = Auxiliary.StringToInt(attribute[5].Value, 0);
         BuyCurrent = Auxiliary.CurrentParse(attribute[6].Value);
-        BuyAmt = Auxiliary.StringToDouble(attribute[7].Value, 0);
+        BuyCost = Auxiliary.StringToDouble(attribute[7].Value, 0);
         BuyAdvanceCurrent = Auxiliary.CurrentParse(attribute[8].Value);
-        BuyAdvanceAmt = Auxiliary.StringToDouble(attribute[9].Value, 0);
+        BuyAdvanceCost = Auxiliary.StringToDouble(attribute[9].Value, 0);
         PixelSize = Auxiliary.StringToInt(attribute[10].Value, 100);
         IconOffset = Auxiliary.StringToFloat(attribute[11].Value, 0);
         IconOffset1 = Auxiliary.StringToVector(',', attribute[12].Value, new Vector3());
@@ -230,14 +231,14 @@ public class CloseItem
 
         float newSize = PixelSize / Sprites[0].rect.width;
 
-        SetUpUI(newSize, new Vector2(), Icon1, Icon2, Icon3);
+        SetupUI(newSize, new Vector2(), Icon1, Icon2, Icon3);
 
         if (BuyCurrent != Current.Free)
         {
-            BuyBtnLab.text = Auxiliary.ImageParse(BuyCurrent) + Auxiliary.ShrinkNumberStr(BuyAmt);
+            BuyBtnLab.text = Auxiliary.ImageParse(BuyCurrent) + Auxiliary.ShrinkNumberStr(BuyCost);
         }
 
-        if (BuyLevel > Manager.Level)
+        if (BuyLevel > Manager.GardenLevel)
         {
             BuyBtn.interactable = false;
             BuyBtn.image.material = Lib.GrayMat;
@@ -250,10 +251,10 @@ public class CloseItem
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
                 ResourceManager.Get(ObjectLabel.Pa_Info).TweenForCG();
-                SetUpUI(newSize, new Vector2(0, 22), ResourceManager.Get<Image>(ObjectLabel.Pa_Icon1), ResourceManager.Get<Image>(ObjectLabel.Pa_Icon3), ResourceManager.Get<Image>(ObjectLabel.Pa_Icon2));
+                SetupUI(newSize, new Vector2(0, 22), ResourceManager.Get<Image>(ObjectLabel.Pa_Icon1), ResourceManager.Get<Image>(ObjectLabel.Pa_Icon3), ResourceManager.Get<Image>(ObjectLabel.Pa_Icon2));
 
                 ResourceManager.SetText(ObjectLabel.Pa_Lab, Name);
-                ResourceManager.SetText(ObjectLabel.Pa_BtnLab, Language.GetStr(LanguageLabel.UI__Pa_BtnLab) + Auxiliary.ImageParse(BuyCurrent) + BuyAmt);
+                ResourceManager.SetText(ObjectLabel.Pa_BtnLab, Language.GetStr(LanguageLabel.UI__Pa_BtnLab) + Auxiliary.ImageParse(BuyCurrent) + BuyCost);
 
                 ResourceManager.SetButtonEvent
                 (
@@ -269,7 +270,7 @@ public class CloseItem
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                if (BuyLevel > Manager.Level)
+                if (BuyLevel > Manager.GardenLevel)
                 {
                     Bubble.Show(null, Language.GetStr(LanguageLabel.UI__P_Unlock));
                     return;
@@ -288,12 +289,12 @@ public class CloseItem
 
         for (int i = 0; i < spriteNames.Length; i++)
         {
-            if (!PlayerManager.CloseSpriteDic.ContainsKey(spriteNames[i]))
+            if (!PlayerManager.CloseSpriteDictionary.ContainsKey(spriteNames[i]))
             {
                 Debug.Log(spriteNames[i]);
             }
 
-            sprites[i] = PlayerManager.CloseSpriteDic[spriteNames[i]];
+            sprites[i] = PlayerManager.CloseSpriteDictionary[spriteNames[i]];
         }
 
         return sprites;
@@ -371,7 +372,6 @@ public class CloseItem
         return bodyParts;
     }
 
-
     protected CloseType TypeParse(string str)
     {
         int type = Auxiliary.StringToInt(str, -1);
@@ -407,7 +407,7 @@ public class CloseItem
     }
 
 
-    public void SetUpUI(float newSize, Vector2 offset, Image icon1, Image icon2, Image icon3)
+    public void SetupUI(float newSize, Vector2 offset, Image icon1, Image icon2, Image icon3)
     {
         icon1.SetActive(false);
         icon3.SetActive(false);
@@ -447,12 +447,12 @@ public class CloseItem
 
     public void Unlock()
     {
-        if (Ignore)
+        if (Unavailable)
         {
             return;
         }
 
-        Possess = true;
+        IsBought = true;
 
         BuyBtn.interactable = false;
         BuyBtn.image.material = Lib.GrayMat;
@@ -467,7 +467,7 @@ public class CloseItem
         Manager.Pay
         (
             "",
-            BuyAmt,
+            BuyCost,
             BuyCurrent,
             () =>
             {
@@ -484,7 +484,7 @@ public class CloseItem
             false,
             () =>
             {
-                PlayerManager.Player.Reset();
+                PlayerManager.Player.ResetDressDatas();
 
                 TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.Pa_Info).TweenBacCG();
 
@@ -493,7 +493,7 @@ public class CloseItem
                     EventType.BackwardFinish,
                     () =>
                     {
-                        PlayerManager.Player.Return();
+                        PlayerManager.Player.LeaveDressroom();
                     }
                 );
 
@@ -513,15 +513,15 @@ public class CloseItem
     {
         Unlock();
         AudioManager.PlayClip(AudioLabel.GetCurrent);
-        PlayerManager.BoughtCloseList.UniqueAdd(id);
-        HttpManager.Save();
+        PlayerManager.BoughtCloseIDs.UniqueAdd(ID);
+        HttpManager.UploadConfig();
     }
 
     public void ChangeDress(Player player)
     {
         player.ChangeClose(BodyPart, ArmatureName);
 
-        if (Ignore)
+        if (Unavailable)
         {
             return;
         }
@@ -545,10 +545,10 @@ public class CloseItem
         SaveDressData(BodyPart);
         if (BodyPart == BodyPart.Top)
         {
-            PlayerManager.DressData[8] = "Empty";
-            PlayerManager.DressData[9] = "Empty";
-            PlayerManager.DressData[10] = "Empty";
-            PlayerManager.DressData[11] = "Empty";
+            PlayerManager.DressDatas[8] = "Empty";
+            PlayerManager.DressDatas[9] = "Empty";
+            PlayerManager.DressDatas[10] = "Empty";
+            PlayerManager.DressDatas[11] = "Empty";
 
             foreach (var bodyPart in ExtraBodyParts)
             {
@@ -561,43 +561,43 @@ public class CloseItem
     {
         if (bodyPart == BodyPart.LeftLongSleeve)
         {
-            PlayerManager.DressData[8] = PlayerManager.Player.LeftLongSleeve;
+            PlayerManager.DressDatas[8] = PlayerManager.Player.LeftLongSleeve;
         }
         else if (bodyPart == BodyPart.LeftShortSleeve)
         {
-            PlayerManager.DressData[9] = PlayerManager.Player.LeftShortSleeve;
+            PlayerManager.DressDatas[9] = PlayerManager.Player.LeftShortSleeve;
         }
         else if (bodyPart == BodyPart.RightLongSleeve)
         {
-            PlayerManager.DressData[10] = PlayerManager.Player.RightLongSleeve;
+            PlayerManager.DressDatas[10] = PlayerManager.Player.RightLongSleeve;
         }
         else if (bodyPart == BodyPart.RightShortSleeve)
         {
-            PlayerManager.DressData[11] = PlayerManager.Player.RightShortSleeve;
+            PlayerManager.DressDatas[11] = PlayerManager.Player.RightShortSleeve;
         }
         else if (bodyPart == BodyPart.Top)
         {
-            PlayerManager.DressData[4] = PlayerManager.Player.Top;
+            PlayerManager.DressDatas[4] = PlayerManager.Player.Top;
         }
         else if (bodyPart == BodyPart.Shoe)
         {
-            PlayerManager.DressData[2] = PlayerManager.Player.Shoe;
+            PlayerManager.DressDatas[2] = PlayerManager.Player.Shoe;
         }
         else if (bodyPart == BodyPart.Head)
         {
-            PlayerManager.DressData[0] = PlayerManager.Player.Head;
+            PlayerManager.DressDatas[0] = PlayerManager.Player.Head;
         }
         else if (bodyPart == BodyPart.Wing)
         {
-            PlayerManager.DressData[7] = PlayerManager.Player.Wing;
+            PlayerManager.DressDatas[7] = PlayerManager.Player.Wing;
         }
         else if (bodyPart == BodyPart.Dress)
         {
-            PlayerManager.DressData[1] = PlayerManager.Player.Dress;
+            PlayerManager.DressDatas[1] = PlayerManager.Player.Dress;
         }
         else if (bodyPart == BodyPart.Headwear)
         {
-            PlayerManager.DressData[3] = PlayerManager.Player.HeadWear;
+            PlayerManager.DressDatas[3] = PlayerManager.Player.HeadWear;
         }
         else
         {
@@ -607,17 +607,17 @@ public class CloseItem
 
     public void OnLevelChange()
     {
-        if (Ignore)
+        if (Unavailable)
         {
             return;
         }
 
-        if (Possess)
+        if (IsBought)
         {
             return;
         }
 
-        if (BuyLevel < Manager.Level)
+        if (BuyLevel < Manager.GardenLevel)
         {
             BuyBtn.interactable = true;
             BuyBtn.image.material = null;
@@ -627,7 +627,7 @@ public class CloseItem
 
     public ExchangeInfo GetExchangeValue(float rate, StaticsManager.ConsumeModule consumeModule)
     {
-        ExchangeInfo info = ExchangeInfo.GetExchangeInfo(BuyCurrent, BuyAmt, rate);
+        ExchangeInfo info = ExchangeInfo.GetExchangeInfo(BuyCurrent, BuyCost, rate);
         ExchangeInfo.GetExchangeValue(info, consumeModule);
         return info;
     }
@@ -641,7 +641,7 @@ public enum PlayerDirection
 
 public class Player : Regist , IPointerClickHandler
 {
-    #region 变量
+    #region Config
 
     public static string IdleAnimationName = "newAnimation";
     public static string JumpAnimationName = "newAnimation1";
@@ -649,7 +649,10 @@ public class Player : Regist , IPointerClickHandler
     public static string RunAnimationName = "newAnimation3";
 
     public static bool InDressRoom;
-    public static float JumpFrequency;
+    public static float InDressRoomJumpFrequency;
+
+    public float JumpTime;
+    public float JumpTimer;
 
     public PlayerDirection PlayerDirection
     {
@@ -661,17 +664,19 @@ public class Player : Regist , IPointerClickHandler
             Flip(playerDirection);
         }
     }
-    private PlayerDirection playerDirection = PlayerDirection.Left;
+    public PlayerDirection playerDirection = PlayerDirection.Left;
 
-    public bool AnimLock1;
-    public bool AnimLock2;
-    public float JumpTime;
-    public float JumpTimer;
+    public bool PlayAnimFlag1;
+    public bool PlayAnimFlag2;
+    public string CurrentAnimationName;
 
     public MeshFilter ExpressionMeshFilter;
 
     public Dictionary<string, Transform> ChildDic = new Dictionary<string, Transform>();
 
+    private string ExpressionName;
+    private Coroutine ResetExpressionCoroutine;
+
     public static Dictionary<string, Vector3> LeftExpressionPositionDictionary = new Dictionary<string, Vector3>
     {
         {"郁闷", new Vector3(0, -0.22f, -0.00001f)},
@@ -798,19 +803,19 @@ public class Player : Regist , IPointerClickHandler
 
             if (JumpTimer > JumpTime)
             {
-                if (!AnimLock1 && !AnimLock2)
+                if (!PlayAnimFlag1 && !PlayAnimFlag2)
                 {
                     PlayAnim(JumpAnimationName);
                 }
 
-                AnimLock2 = true;
+                PlayAnimFlag2 = true;
             }
 
-            if (JumpTimer > JumpFrequency)
+            if (JumpTimer > InDressRoomJumpFrequency)
             {
-                AnimLock2 = false;
+                PlayAnimFlag2 = false;
 
-                JumpTime = Mathf.Lerp(0, JumpFrequency, Random.Range(0f, 1f));
+                JumpTime = Mathf.Lerp(0, InDressRoomJumpFrequency, Random.Range(0f, 1f));
                 JumpTimer = 0;
             }
         }
@@ -821,13 +826,14 @@ public class Player : Regist , IPointerClickHandler
         //}
     }
 
-    public void OnStart(string str, EventObject eventObject)
+
+    public void OnAnimStart(string str, EventObject eventObject)
     {
         if (eventObject.animationState.name == JumpAnimationName)
         {
             Shadow.StreamReForScale();
 
-            AnimLock1 = true;
+            PlayAnimFlag1 = true;
 
             TempClose = Eye;
 
@@ -835,7 +841,7 @@ public class Player : Regist , IPointerClickHandler
         }
         else if (eventObject.animationState.name == IdleAnimationName)
         {
-            AnimLock1 = false;
+            PlayAnimFlag1 = false;
 
             if (TempClose != null)
             {
@@ -844,10 +850,9 @@ public class Player : Regist , IPointerClickHandler
         }
     }
 
-    public string CurrentAnimationName;
     public void PlayAnim(string animName)
     {
-        if (AnimLock1)
+        if (PlayAnimFlag1)
         {
             return;
         }
@@ -901,8 +906,6 @@ public class Player : Regist , IPointerClickHandler
         MouseSlot.UnityTransform.GetChild(0).SetActive(true);
     }
 
-    private string ExpressionName;
-    private Coroutine ResetExpressionCoroutine;
     public void ChangeExpression(string expressionName, float duration)
     {
         ExpressionName = expressionName;
@@ -982,78 +985,113 @@ public class Player : Regist , IPointerClickHandler
     }
 
 
-    public void Save(bool showNavigate)
+    public void SaveDressDatas(bool showNavigate)
     {
         AudioManager.PlayClip(AudioLabel.ClickButton);
 
         List<CloseItem> closeUnitList = new List<CloseItem>();
 
-        closeUnitList.Add(PlayerManager.CloseItemDic[PlayerManager.CloseIDDic[Head]]);
-        closeUnitList.Add(PlayerManager.CloseItemDic[PlayerManager.CloseIDDic[Dress]]);
-        closeUnitList.Add(PlayerManager.CloseItemDic[PlayerManager.CloseIDDic[Shoe]]);
-        closeUnitList.Add(PlayerManager.CloseItemDic[PlayerManager.CloseIDDic[HeadWear]]);
-        closeUnitList.Add(PlayerManager.CloseItemDic[PlayerManager.CloseIDDic[Top]]);
+        closeUnitList.Add(PlayerManager.CloseItemDictionary[PlayerManager.CloseIDDictionary[Head]]);
+        closeUnitList.Add(PlayerManager.CloseItemDictionary[PlayerManager.CloseIDDictionary[Dress]]);
+        closeUnitList.Add(PlayerManager.CloseItemDictionary[PlayerManager.CloseIDDictionary[Shoe]]);
+        closeUnitList.Add(PlayerManager.CloseItemDictionary[PlayerManager.CloseIDDictionary[HeadWear]]);
+        closeUnitList.Add(PlayerManager.CloseItemDictionary[PlayerManager.CloseIDDictionary[Top]]);
 
         if (Wing != "Empty")
         {
-            closeUnitList.Add(PlayerManager.CloseItemDic[PlayerManager.CloseIDDic[Wing]]);
+            closeUnitList.Add(PlayerManager.CloseItemDictionary[PlayerManager.CloseIDDictionary[Wing]]);
         }
 
         for (int i = 0; i < closeUnitList.Count; i++)
         {
-            if (!closeUnitList[i].Possess)
+            if (!closeUnitList[i].IsBought)
             {
                 if (showNavigate)
                 {
-                    BuyNavigate(closeUnitList);
+                    BuyDressNavigate(closeUnitList);
                 }
 
                 return;
             }
         }
 
-        PlayerManager.DressData[0] = Head;
-        PlayerManager.DressData[1] = Dress;
-        PlayerManager.DressData[2] = Shoe;
-        PlayerManager.DressData[3] = HeadWear;
-        PlayerManager.DressData[4] = Top;
-        PlayerManager.DressData[7] = Wing;
-        PlayerManager.DressData[8] = LeftLongSleeve;
-        PlayerManager.DressData[9] = LeftShortSleeve;
-        PlayerManager.DressData[10] = RightLongSleeve;
-        PlayerManager.DressData[11] = RightShortSleeve;
+        PlayerManager.DressDatas[0] = Head;
+        PlayerManager.DressDatas[1] = Dress;
+        PlayerManager.DressDatas[2] = Shoe;
+        PlayerManager.DressDatas[3] = HeadWear;
+        PlayerManager.DressDatas[4] = Top;
+        PlayerManager.DressDatas[7] = Wing;
+        PlayerManager.DressDatas[8] = LeftLongSleeve;
+        PlayerManager.DressDatas[9] = LeftShortSleeve;
+        PlayerManager.DressDatas[10] = RightLongSleeve;
+        PlayerManager.DressDatas[11] = RightShortSleeve;
     }
 
-    public void Reset()
+    public void ResetDressDatas()
     {
         AudioManager.PlayClip(AudioLabel.ClickButton);
 
-        List<string> dressData = new List<string>(PlayerManager.DressData);
+        List<string> dressData = new List<string>(PlayerManager.DressDatas);
 
         dressData[5] = Eye;
 
         PlayerManager.BuildPlayer(dressData);
     }
 
-    public void Return()
+    public void BuyDressNavigate(List<CloseItem> closeUnitList)
+    {
+        for (int i = 0; i < closeUnitList.Count; i++)
+        {
+            if (closeUnitList[i].IsBought)
+            {
+                closeUnitList.RemoveAt(i--);
+            }
+            else
+            {
+                closeUnitList[i].BuyBtn.onClick.Invoke();
+
+                closeUnitList.RemoveAt(i--);
+
+                ResourceManager.Get(ObjectLabel.Pa_Info).GetTweenCG().AddEventOnetime
+                    (
+                        EventType.BackwardFinish,
+                        () =>
+                        {
+                            if (closeUnitList.Count == 0)
+                            {
+                                SaveDressDatas(false);
+                            }
+                            else
+                            {
+                                BuyDressNavigate(closeUnitList);
+                            }
+                        }
+                    );
+
+                return;
+            }
+        }
+    }
+
+    public void LeaveDressroom()
     {
         bool allSave = true;
         bool allBought = true;
 
-        List<string> currentDerssData = new List<string>() {Head, Dress, Shoe, HeadWear, Top, Wing};
+        List<string> currentDerssData = new List<string>() { Head, Dress, Shoe, HeadWear, Top, Wing };
 
         for (int i = 0; i < currentDerssData.Count; i++)
         {
-            if (!PlayerManager.CloseIDDic.ContainsKey(currentDerssData[i]))
+            if (!PlayerManager.CloseIDDictionary.ContainsKey(currentDerssData[i]))
             {
                 continue;
             }
 
-            int id = PlayerManager.CloseIDDic[currentDerssData[i]];
+            int id = PlayerManager.CloseIDDictionary[currentDerssData[i]];
 
-            allBought = allBought && PlayerManager.CloseItemDic[id].Possess;
+            allBought = allBought && PlayerManager.CloseItemDictionary[id].IsBought;
             //Debug.Log(ManaPlayer.CloseUnitDic[id].Name + "    " + ManaPlayer.CloseUnitDic[id].Bought);
-            allSave = allSave && currentDerssData[i] == PlayerManager.DressData[i];
+            allSave = allSave && currentDerssData[i] == PlayerManager.DressDatas[i];
         }
 
         if (allBought)
@@ -1064,7 +1102,7 @@ public class Player : Regist , IPointerClickHandler
             }
             else
             {
-                Reset();
+                ResetDressDatas();
                 ExitDressRoom();
             }
         }
@@ -1075,51 +1113,16 @@ public class Player : Regist , IPointerClickHandler
                 null, Language.GetStr(LanguageLabel.UI__P_Return), null, null,
                 () =>
                 {
-                    Reset();
+                    ResetDressDatas();
                     ResourceManager.Get(ObjectLabel.K_Bubble).GetTweenGra().AddEventOnetime(EventType.BackwardFinish, () => { ExitDressRoom(); });
                 }
             );
         }
     }
 
-    public void BuyNavigate(List<CloseItem> closeUnitList)
-    {
-        for (int i = 0; i < closeUnitList.Count; i++)
-        {
-            if (closeUnitList[i].Possess)
-            {
-                closeUnitList.RemoveAt(i--);
-            }
-            else
-            {
-                closeUnitList[i].BuyBtn.onClick.Invoke();
-
-                closeUnitList.RemoveAt(i--);
-
-                ResourceManager.Get(ObjectLabel.Pa_Info).GetTweenCG().AddEventOnetime
-                    (
-                        EventType.BackwardFinish,
-                        () =>
-                        {
-                            if (closeUnitList.Count == 0)
-                            {
-                                Save(false);
-                            }
-                            else
-                            {
-                                BuyNavigate(closeUnitList);
-                            }
-                        }
-                    );
-
-                return;
-            }
-        }
-    }
-
     public void ExitDressRoom()
     {
-        Manager.SceneSwitchLock = false;
+        Manager.SceneSwitchFlag = false;
 
         TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.I_BlackMask).TweenBacCG();
 
@@ -1128,10 +1131,10 @@ public class Player : Regist , IPointerClickHandler
                 EventType.BackwardFinish,
                 () =>
                 {
-                    transform.SetParent(ResourceManager.Get(GardenLabel.GardenNormal));
+                    transform.SetParent(ResourceManager.Get(GardenLabel.GardenPivot));
 
-                    transform.position = ResourceManager.Get(GardenLabel.PlayerPosTra).position;
-                    transform.localScale = ResourceManager.Get(GardenLabel.PlayerPosTra).lossyScale;
+                    transform.position = ResourceManager.Get(GardenLabel.GardenPlayerPos).position;
+                    transform.localScale = ResourceManager.Get(GardenLabel.GardenPlayerPos).lossyScale;
 
                     ResourceManager.Get(ResourceLabel.Garden).TweenForSr();
                     ResourceManager.Get(DressroomLabel.DressRoom).TweenBacSr();
@@ -1167,7 +1170,7 @@ public class Player : Regist , IPointerClickHandler
 
     public void EnterDressRoom()
     {
-        if (Manager.SceneSwitchLock)
+        if (Manager.SceneSwitchFlag)
         {
             return;
         }
@@ -1178,7 +1181,7 @@ public class Player : Regist , IPointerClickHandler
 
         JumpTime = Mathf.Lerp(0, 10, Random.Range(0.5f, 1f));
 
-        Manager.SceneSwitchLock = true;
+        Manager.SceneSwitchFlag = true;
 
 
         ResourceManager.Get(ObjectLabel.C_Main).TweenBacCG();
@@ -1268,13 +1271,13 @@ public class Player : Regist , IPointerClickHandler
 
     public UnityArmatureComponent Build()
     {
-        if (!PlayerManager.Complete)
+        if (!PlayerManager.Inited)
         {
             UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>(ResourceLabel.StandSke, Folder.Config));
 
             UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.StandTex, Folder.Config), ResourceLabel.StandTexture);
 
-            PlayerManager.Complete = true;
+            PlayerManager.Inited = true;
         }
 
         UAC = UnityFactory.factory.BuildArmatureComponent("Armature");
@@ -1285,7 +1288,7 @@ public class Player : Regist , IPointerClickHandler
 
         UAC.anim.Play(IdleAnimationName);
 
-        UAC.AddEventListener(EventObject.START, OnStart);
+        UAC.AddEventListener(EventObject.START, OnAnimStart);
 
         Eye = "眼睛1";
         Top = "上衣1";

Assets/Script/Object/PlazaRoom.cs

@@ -64,7 +64,10 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 
     private static string PhonoGraphAnimName = "newAnimation";
 
-    private static List<StarCreater> StarCreaters;
+    private static Vector3 HitPosOffset = new Vector3(0, 0, -3);
+    private static List<StarCreater> StarCreaters = new List<StarCreater>();
+
+    public static Dictionary<Transform, List<Transform>> ControllDepthDictionary = new Dictionary<Transform, List<Transform>>();
 
     #endregion
 
@@ -77,29 +80,10 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 
         LoadScene();
 
-        SetCloud();
+        InitCloud();
     }
 
-    private static void LoadScene()
-    {
-        StarCreaters.Add(new StarCreater());
-        StarCreaters.Add(new StarCreater());
-
-        Transform tra = ResourceManager.Get(PlazaRoomLabel.PlazaRoom, Folder.Scene, true, null, true);
-        tra.AddComponent<PlazaRoom>();
-
-        UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>(ResourceLabel.PhonoGraphSke, Folder.Config));
-
-        UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.PhonoGraphTex, Folder.Config), ResourceLabel.PhonoGraphTexture);
-
-        UnityArmatureComponent uac = UnityFactory.factory.BuildArmatureComponent(PlazaRoomLabel.PhonoGraph);
-
-        uac.transform.parent = ResourceManager.Get(PlazaRoomLabel.PhonoGraph);
-        uac.anim.Play(PhonoGraphAnimName);
-        uac.transform.localPosition = new Vector3();
-    }
-
-    private static void SetCloud()
+    private static void InitCloud()
     {
         #region Cloud1
 
@@ -144,14 +128,34 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
         #endregion
     }
 
+    private static void LoadScene()
+    {
+        StarCreaters.Add(new StarCreater());
+        StarCreaters.Add(new StarCreater());
+
+        Transform tra = ResourceManager.Get(PlazaRoomLabel.PlazaRoom, Folder.Scene, true, null, true);
+        tra.AddComponent<PlazaRoom>();
+
+        UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>(ResourceLabel.PhonoGraphSke, Folder.Config));
+
+        UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.PhonoGraphTex, Folder.Config), ResourceLabel.PhonoGraphTexture);
+
+        UnityArmatureComponent uac = UnityFactory.factory.BuildArmatureComponent(PlazaRoomLabel.PhonoGraph);
+
+        uac.transform.parent = ResourceManager.Get(PlazaRoomLabel.PhonoGraph);
+        uac.anim.Play(PhonoGraphAnimName);
+        uac.transform.localPosition = new Vector3();
+    }
+
+
     public void Update()
     {
-        StarThread();
+        CreateStarThread();
 
-        DepthThread();
+        ControllDepthThread();
     }
 
-    public void StarThread()
+    public void CreateStarThread()
     {
         foreach (var starCreater in StarCreaters)
         {
@@ -159,7 +163,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
         }
     }
 
-    public void DepthThread()
+    public void ControllDepthThread()
     {
         foreach (var v in SFSManager.GardenSmartFox.PlazaRoomController.UserInstanceDictionary.Values)
         {
@@ -172,7 +176,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
         }
     }
 
-    public static Dictionary<Transform, List<Transform>> DepthDictionary = new Dictionary<Transform, List<Transform>>();
+
     public void ResetDepth()
     {
         Dictionary<Transform, List<Transform>> tempDictionary = new Dictionary<Transform, List<Transform>>();
@@ -180,7 +184,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
         {
             tempDictionary.Add(plazaRoomPlayer.Player.transform, new List<Transform> {plazaRoomPlayer.MessageBox, plazaRoomPlayer.NickNameTransform});
         }
-        foreach (var kv in DepthDictionary)
+        foreach (var kv in ControllDepthDictionary)
         {
             tempDictionary.Add(kv.Key, kv.Value);
         }
@@ -202,9 +206,9 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
         SFSManager.GardenSmartFox.PlazaRoomController.MoveTo(HitPositionToDestination(eventData.pointerCurrentRaycast.worldPosition));
     }
 
-    private static Vector3 Offset = new Vector3(0, 0, -3);
+
     public static Vector3 HitPositionToDestination(Vector3 hitPosition)
     {
-        return hitPosition + Offset;
+        return hitPosition + HitPosOffset;
     }
 }

Assets/Script/Object/PlazaRoomChest.cs

@@ -18,8 +18,8 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 {
     #region Config
 
-    public float Time = 5;
-    public float Timer;
+    public float ShakeTime = 5;
+    public float ShakeTimer;
     public bool IsActive = true;
 
     public Animator Animator
@@ -44,13 +44,13 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
     public Text ChestTimerLab;
     public Transform ChestTimerTransform;
-    public float ChestTime = 600;
-    public float ChestTimer;
-    public bool CheckLock;
+    public float ChestRefreshTime = 600;
+    public float ChestRefreshTimer;
+    public bool IsAwardAvailable;
 
     public DateTime LastActivatedTime; //只有系统宝箱才用
 
-    public bool Initialized;
+    public bool Inited;
     public MeshFilter ChestMF;
     public MeshFilter ShadowMF;
     public MeshRenderer ChestMR;
@@ -136,8 +136,9 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     public TweenRenderer TweenRenderer;
     public TweenScale TweenScale;
 
-    public static InputField InputField;
-    public static PlazaRoomChest CurrentChest;
+    public static InputField GuessInputField;
+
+    public static PlazaRoomChest SelectedChest;
     public static PlazaRoomChest SystemChest;
 
     #endregion
@@ -146,27 +147,27 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     {
         if (!IsActive)
         {
-            if (ChestData.ChestType == ChestType.System && !CheckLock)
+            if (ChestData.ChestType == ChestType.System && !IsAwardAvailable)
             {
-                if (ChestTimer <= 0)
+                if (ChestRefreshTimer <= 0)
                 {
                     SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultChestStatus(ChestData.DatabaseRoomID);
-                    CheckLock = true;
+                    IsAwardAvailable = true;
                 }
                 else
                 {
-                    ChestTimer -= UnityEngine.Time.deltaTime;
-                    ChestTimerLab.text = ChestTimer.ToString("F0");
+                    ChestRefreshTimer -= UnityEngine.Time.deltaTime;
+                    ChestTimerLab.text = ChestRefreshTimer.ToString("F0");
                 }
             }
         }
         else
         {
-            Timer += UnityEngine.Time.deltaTime;
+            ShakeTimer += UnityEngine.Time.deltaTime;
 
-            if (Timer >= Time)
+            if (ShakeTimer >= ShakeTime)
             {
-                Timer = 0;
+                ShakeTimer = 0;
 
                 Animator.SetInteger("Count", 0);
             }
@@ -178,7 +179,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     {
         if (ChestData.ChestType == ChestType.System || ChestData.ChestType == ChestType.Lucky)
         {
-            Take();
+            GetAward();
         }
         else
         {
@@ -186,7 +187,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         }
     }
 
-    private void Take()
+    private void GetAward()
     {
         Deactive();
         TurnGray();
@@ -240,11 +241,11 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     private void GuessFailed()
     {
         ChestOperateData chestOperateData;
-        ChestManager.OperateDataDictionary.TryGetValue(CurrentChest.ChestData.ID, out chestOperateData);
+        ChestManager.OperateDataDictionary.TryGetValue(SelectedChest.ChestData.ID, out chestOperateData);
         int remainGuessAmt;
         if (chestOperateData == null)
         {
-            chestOperateData = new ChestOperateData(false, CurrentChest.ChestData.ID, CurrentChest.ChestData.DatabaseRoomID);
+            chestOperateData = new ChestOperateData(false, SelectedChest.ChestData.ID, SelectedChest.ChestData.DatabaseRoomID);
             ChestManager.OperateDataDictionary.UniqueAdd(chestOperateData.ChestID, chestOperateData);
             remainGuessAmt = ChestManager.PlayerMaxGuessAmt - 1;
         }
@@ -256,7 +257,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         {
             remainGuessAmt = (int) chestOperateData.RemainGuessAmt - 1;
         }
-        ChestManager.OperateDataDictionary[CurrentChest.ChestData.ID].RemainGuessAmt = remainGuessAmt;
+        ChestManager.OperateDataDictionary[SelectedChest.ChestData.ID].RemainGuessAmt = remainGuessAmt;
 
         string hint = Language.GetStr(LanguageLabel.UI__Y_GuessWrong);
         hint = hint.Replace(TransferLabel.Value, remainGuessAmt.ToString());
@@ -287,13 +288,14 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         TweenRenderer.StartBackward();
     }
 
+
     public void Init(ChestData chestData)
     {
         BaseInit(chestData);
 
         if (chestData.ChestType == ChestType.GuessColor)
         {
-            AnswerInfo = GardenManager.FlowerInfoDic.Random();
+            AnswerInfo = GardenManager.FlowerInfoDictionary.Random();
             AnswerColor = Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.FlowerColor, AnswerInfo.FullID)).ToLower();
         }
     }
@@ -312,10 +314,10 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         {
             hudTarget = ChestTimerTransform.AddComponent<HudTarget>();
             ChestTimerTransform.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
-            PlazaRoom.DepthDictionary.Add(transform, new List<Transform> {ChestTimerTransform});
+            PlazaRoom.ControllDepthDictionary.Add(transform, new List<Transform> {ChestTimerTransform});
         }
         hudTarget.PosTra = transform.parent.FindChild(PlazaRoomChestLabel.Hud);
-        ResetChestTimer();
+        ResetChestRefreshTimer();
         SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultChestStatus(chestData.DatabaseRoomID);
 
         SystemChest = this;
@@ -325,14 +327,14 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     {
         ChestData = chestData;
 
-        if (InputField == null)
+        if (GuessInputField == null)
         {
-            InputField = ResourceManager.Get<InputField>(ObjectLabel.Y_InputField);
+            GuessInputField = ResourceManager.Get<InputField>(ObjectLabel.Y_InputField);
         }
 
-        if (!Initialized)
+        if (!Inited)
         {
-            Initialized = true;
+            Inited = true;
 
             ParentMR = transform.parent.GetComponent<MeshRenderer>();
             ChestMF = transform.GetComponent<MeshFilter>();
@@ -390,19 +392,14 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         }
     }
 
-    public void ResetChestTimer()
+    public void ResetChestRefreshTimer()
     {
-        CheckLock = false;
+        IsAwardAvailable = false;
         ChestTimerTransform.TweenForCG();
-        ChestTimer = ChestTime;
+        ChestRefreshTimer = ChestRefreshTime;
     }
 
 
-    public void OnFinish()
-    {
-        Animator.SetInteger("Count", Animator.GetInteger("Count") + 1);
-    }
-
     public void Deactive()
     {
         IsActive = false;
@@ -421,6 +418,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         }
     }
 
+
     public void TurnGray()
     {
         TweenGrayMesh.StartBackward();
@@ -434,7 +432,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
     public void OnPointerClick(PointerEventData eventData)
     {
-        CurrentChest = this;
+        SelectedChest = this;
 
         AudioManager.PlayClip(AudioLabel.ClickButton);
 
@@ -476,8 +474,8 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
                 LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Tit), new MulLanStr(LanguageLabel.UI__Yb_GuessColor));
                 LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Desc), new MulLanStr(LanguageLabel.UI__Y_GuessColorDesc));
 
-                InputField.text = "";
-                InputField.characterLimit = 30;
+                GuessInputField.text = "";
+                GuessInputField.characterLimit = 30;
             }
             else
             {
@@ -486,12 +484,19 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
                 LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Tit), new MulLanStr(LanguageLabel.UI__Yb_GuessNumber));
                 LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.Y_Desc), new MulLanStr(LanguageLabel.UI__Y_GuessNumberDesc));
 
-                InputField.text = "";
-                InputField.characterLimit = 1;
+                GuessInputField.text = "";
+                GuessInputField.characterLimit = 1;
             }
         }
     }
 
+
+    public void OnFinish()
+    {
+        Animator.SetInteger("Count", Animator.GetInteger("Count") + 1);
+    }
+
+
     public void OnApplicationPause(bool pause)
     {
         if (!pause)

Assets/Script/Object/PlazaRoomItem.cs

@@ -72,7 +72,7 @@ public class RoomData
     public PlazaRoomItem CreateItem()
     {
         PlazaRoomItem plazaRoomItem = ResourceManager.Get(ResourceLabel.PlazaRoomItem, Folder.UI, false, ResourceManager.Get(ObjectLabel.Z_Grid), false, ObjType.PlazaRoomItem, typeof(PlazaRoomItem)).GetComponent<PlazaRoomItem>();
-        plazaRoomItem.Regist();
+        plazaRoomItem.Init();
         return plazaRoomItem;
     }
 
@@ -111,7 +111,7 @@ public class PlazaRoomItemLabel
     public static string Status = "Status";
     public static string Duration = "Duration";
     public static string People = "People";
-    public static string Img0 = "Img0";
+    public static string SystemIconBK = "SystemIconBK";
     public static string Btn = "Btn";
     public static string BtnLab = "BtnLab";
 }
@@ -120,7 +120,7 @@ public class PlazaRoomItem : MonoBehaviour
 {
     #region Config
 
-    public bool Registed;
+    public bool Inited;
     public RoomData RoomData;
 
     public Text ID;
@@ -129,17 +129,17 @@ public class PlazaRoomItem : MonoBehaviour
     public Text Duration;
     public Text People;
     public Text ButtonLab;
-    public Image Img0;
+    public Image SystemIconBK;
     public Button Button;
 
     #endregion
 
-    public void Regist()
+    public void Init()
     {
-        if (Registed)
+        if (Inited)
             return;
         else
-            Registed = true;
+            Inited = true;
 
         Dictionary<string, Transform> dictionary = new Dictionary<string, Transform>();
         Auxiliary.CompileDic(transform, dictionary);
@@ -148,23 +148,24 @@ public class PlazaRoomItem : MonoBehaviour
         Status = dictionary[PlazaRoomItemLabel.Status].GetComponent<Text>();
         Duration = dictionary[PlazaRoomItemLabel.Duration].GetComponent<Text>();
         People = dictionary[PlazaRoomItemLabel.People].GetComponent<Text>();
-        Img0 = dictionary[PlazaRoomItemLabel.Img0].GetComponent<Image>();
+        SystemIconBK = dictionary[PlazaRoomItemLabel.SystemIconBK].GetComponent<Image>();
         Button = dictionary[PlazaRoomItemLabel.Btn].GetComponent<Button>();
         ButtonLab = dictionary[PlazaRoomItemLabel.BtnLab].GetComponent<Text>();
     }
 
+
     public PlazaRoomItem Init(RoomData roomData)
     {
         RoomData = roomData;
         if (RoomData.IsSystemRoom)
         {
             ID.SetActive(false);
-            Img0.SetActive(true);
+            SystemIconBK.SetActive(true);
         }
         else
         {
             ID.SetActive(true);
-            Img0.SetActive(false);
+            SystemIconBK.SetActive(false);
             ID.text = RoomData.ID.ToString();
         }
 
@@ -193,13 +194,14 @@ public class PlazaRoomItem : MonoBehaviour
         (
             () =>
             {
-                OnJoinBtn(roomData);
+                OnJoinBtnClick(roomData);
             }
         );
 
         return this;
     }
 
+
     public void RefreshStatus(bool available)
     {
         if (available)
@@ -230,7 +232,7 @@ public class PlazaRoomItem : MonoBehaviour
     }
 
 
-    public static void OnJoinBtn(RoomData roomData)
+    public static void OnJoinBtnClick(RoomData roomData)
     {
         AudioManager.PlayClip(AudioLabel.ClickButton);
         SFSManager.GardenSmartFox.PlazaRoomController.BeginEnterPlazaRoom(roomData);

Assets/Script/Object/PlazaRoomStar.cs

@@ -7,7 +7,7 @@ public class PlazaRoomStar : MonoBehaviour
 {
     #region Config
 
-    public bool Initialized;
+    public bool Inited;
     public TweenSr TweenSr;
 
     #endregion
@@ -21,7 +21,7 @@ public class PlazaRoomStar : MonoBehaviour
 
     public void Initialize()
     {
-        if (Initialized)
+        if (Inited)
         {
             return;
         }

Assets/Script/Object/RankItem.cs

@@ -9,21 +9,21 @@ using Random = UnityEngine.Random;
 
 public class RanktemLabel
 {
-    public static string Tit = "Tit";
-    public static string TitBK = "TitBK";
-    public static string VisitLab = "VisitLab";
-    public static string PraiseLab = "PraiseLab";
+    public static string Title = "Title";
+    public static string TitleBK = "TitleBK";
+    public static string VisitText = "VisitText";
+    public static string PraiseText = "PraiseText";
     public static string VisitBtn = "VisitBtn";
-    public static string ContentLab = "ContentLab";
+    public static string ContentText = "ContentText";
 }
 
 public class Ranktem : Regist
 {
-    public Text Tit;
-    public Text VisitLab;
-    public Text PraiseLab;
-    public Text ContentLab;
-    public Image TitBK;
+    public Text Title;
+    public Text VisitText;
+    public Text PraiseText;
+    public Text ContentText;
+    public Image TitleBK;
     public Button VisitBtn;
 
     public int Rank;
@@ -41,58 +41,60 @@ public class Ranktem : Regist
 
         Auxiliary.CompileDic(transform, childDic);
 
-        Tit = childDic[RanktemLabel.Tit].GetComponent<Text>();
-        TitBK = childDic[RanktemLabel.TitBK].GetComponent<Image>();
-        VisitLab = childDic[RanktemLabel.VisitLab].GetComponent<Text>();
-        PraiseLab = childDic[RanktemLabel.PraiseLab].GetComponent<Text>();
+        Title = childDic[RanktemLabel.Title].GetComponent<Text>();
+        TitleBK = childDic[RanktemLabel.TitleBK].GetComponent<Image>();
+        VisitText = childDic[RanktemLabel.VisitText].GetComponent<Text>();
+        PraiseText = childDic[RanktemLabel.PraiseText].GetComponent<Text>();
         VisitBtn = childDic[RanktemLabel.VisitBtn].GetComponent<Button>();
-        ContentLab = childDic[RanktemLabel.ContentLab].GetComponent<Text>();
+        ContentText = childDic[RanktemLabel.ContentText].GetComponent<Text>();
 
-        VisitLab.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+        VisitText.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
 
         VisitBtn.onClick.AddListener(Visit);
 
         Manager.OnLevelChange += () =>
         {
-            VisitLab.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
+            VisitText.text = ResourceManager.Get<Text>(ObjectLabel.C_CostLab).text;
         };
 
         return false;
     }
 
+
     public void Visit()
     {
         SocialManager.CloseRankPanel();
         SocialManager.RecordRankPanel();
 
-        VisitManager.Visit(ArchiveSource.SerialNumber, SerialNumber);
+        VisitManager.Visit(ConfigSource.SerialNumber, SerialNumber);
     }
 
+
     public void Reset(string rank, string praise, string serialNumber)
     {
         Rank = int.Parse(rank);
         Praise = int.Parse(praise);
         SerialNumber = serialNumber;
 
-        Tit.text = rank;
-        PraiseLab.text = praise;
-        ContentLab.text = "******" + serialNumber.Substring(serialNumber.Length - 4);
+        Title.text = rank;
+        PraiseText.text = praise;
+        ContentText.text = "******" + serialNumber.Substring(serialNumber.Length - 4);
 
         if (Rank == 1)
         {
-            TitBK.color = Lib.FirstRank;
+            TitleBK.color = Lib.FirstRank;
         }
         else if (Rank == 2)
         {
-            TitBK.color = Lib.SecondRank;
+            TitleBK.color = Lib.SecondRank;
         }
         else if (Rank == 3)
         {
-            TitBK.color = Lib.ThirdRank;
+            TitleBK.color = Lib.ThirdRank;
         }
         else
         {
-            TitBK.color = Lib.NormalRank;
+            TitleBK.color = Lib.NormalRank;
         }
 
         if (SerialNumber == HttpManager.SerialNumber)

Assets/Script/Object/Skill/Ability.cs

@@ -17,12 +17,14 @@ public class Ability : SkillRoot
 
     public float UnlockAheadAmt
     {
-        get { return UnlockAheadBaseAmt + (UnlockLv - Manager.Level - 1)*UnlockAheadDeltaAmt; }
+        get { return UnlockAheadBaseAmt + (UnlockLv - Manager.GardenLevel - 1)*UnlockAheadDeltaAmt; }
     }
+
     public override string FullIDPrefix
     {
         get { return "Ability"; }
     }
+
     public static string ElfAnim = "Elf";
     public static string ItemAnim = "Item";
 
@@ -55,7 +57,7 @@ public class Ability : SkillRoot
 
     #endregion
 
-    public bool ElfLock = true;
+    public bool ElfFlag = true;
 
     public string Elf;
     public string Item;
@@ -70,49 +72,51 @@ public class Ability : SkillRoot
 
     public override SkillStatus ItemStatus
     {
-        get { return ItemStatus_; }
+        get { return itemStatus; }
         set
         {
-            ItemStatus_ = value;
+            itemStatus = value;
 
-            if (ItemStatus_ == SkillStatus.Lock)
+            if (itemStatus == SkillStatus.Lock)
             {
                 if (UnlockAheadCur == Current.Free)
                 {
-                    ItemBtn.interactable = false;
+                    button.interactable = false;
 
-                    LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab1), "\n", new MulLanStr(LanguageLabel.UI__Fe_BtnLab4), UnlockLv.ToString());
+                    LanguageManager.Add(ButtonTitle, new MulLanStr(LanguageLabel.UI__Fe_BtnLab1), "\n", new MulLanStr(LanguageLabel.UI__Fe_BtnLab4), UnlockLv.ToString());
                 }
                 else
                 {
-                    ItemBtn.interactable = true;
+                    button.interactable = true;
 
-                    LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab0), "\n", new MulLanStr(LanguageLabel.UI__Fe_BtnLab4), UnlockLv.ToString());
+                    LanguageManager.Add(ButtonTitle, new MulLanStr(LanguageLabel.UI__Fe_BtnLab0), "\n", new MulLanStr(LanguageLabel.UI__Fe_BtnLab4), UnlockLv.ToString());
                 }
             }
-            else if (ItemStatus_ == SkillStatus.UnLock)
+            else if (itemStatus == SkillStatus.UnLock)
             {
-                ItemBtn.interactable = true;
+                button.interactable = true;
 
-                ItemBtnLab.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab1) + "\n" + Auxiliary.ImageParse(UnlockCur) + Auxiliary.ShrinkNumberStr(UnlockAmt);
+                ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab1) + "\n" + Auxiliary.ImageParse(UnlockCur) + Auxiliary.ShrinkNumberStr(UnlockAmt);
             }
-            else if (ItemStatus_ == SkillStatus.Upgrade)
+            else if (itemStatus == SkillStatus.Upgrade)
             {
-                ItemBtn.interactable = true;
+                button.interactable = true;
 
-                ItemBtnLab.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
+                ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
             }
         }
     }
 
+    private static int BannedSlotIndexForZoomIn = 4;
+
     #endregion
 
     public Ability(XmlAttributeCollection attribute)
     {
         #region 配置
 
-        ID_ = int.Parse(attribute[0].Value);
-        Icon_ = attribute[21].Value;
+        ID = int.Parse(attribute[0].Value);
+        icon = attribute[21].Value;
         Anim = attribute[22].Value;
         Label = attribute[23].Value;
 
@@ -130,7 +134,7 @@ public class Ability : SkillRoot
         UnlockAheadDeltaAmt = Auxiliary.StringToFloat(attribute[9].Value, 0);
 
         SkillTab = SkillClassParse(attribute[2].Value);
-        UpgradeAmt = UpgradeAmtParse(attribute[15].Value);
+        UpgradeAmt = GetUpgradeAmt(attribute[15].Value);
         
         UnlockCur = Auxiliary.CurrentParse(attribute[11].Value);
         UpgradeCur = Auxiliary.CurrentParse(attribute[14].Value);
@@ -180,7 +184,7 @@ public class Ability : SkillRoot
 
         Level = int.Parse(attribute[3].Value);
 
-        ItemStatus_ = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);
+        itemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);
 
 
         NewPlus = Plus;
@@ -193,7 +197,7 @@ public class Ability : SkillRoot
 
         if (FullID == "Ability1")
         {
-            Manager.Level = Level;
+            Manager.GardenLevel = Level;
 
             if (Level > 0)
             {
@@ -201,16 +205,16 @@ public class Ability : SkillRoot
             }
         }
 
-        if (ItemStatus_ == SkillStatus.Lock || ItemStatus_ == SkillStatus.UnLock)
+        if (itemStatus == SkillStatus.Lock || itemStatus == SkillStatus.UnLock)
         {
-            ItemIcon.material = Lib.GrayMat;
+            SkillIcon.material = Lib.GrayMat;
         }
         else
         {
-            ItemIcon.material = null;
+            SkillIcon.material = null;
         }
 
-        if (ItemStatus_ == SkillStatus.Upgrade)
+        if (itemStatus == SkillStatus.Upgrade)
         {
             for (int i = 0; i < Level - 1; i++)
             {
@@ -228,18 +232,18 @@ public class Ability : SkillRoot
             GetAward();
             GetSlot();
         }
-        else if (ItemStatus_ == SkillStatus.UnLock)
+        else if (itemStatus == SkillStatus.UnLock)
         {
-            UIManager.UpdateHint();
+            UIManager.UpdateManagePanelHint();
         }
 
 
         ItemStatus = ItemStatus;
 
-        ItemBtn.onClick.RemoveAllListeners();
-        ItemBtn.onClick.AddListener(OnClick);
+        button.onClick.RemoveAllListeners();
+        button.onClick.AddListener(OnClick);
 
-        ItemLab.text = GetDescription(0);
+        DescriptionText.text = GetDescription(0);
     }
 
     public override void SwitchLanguage()
@@ -252,9 +256,9 @@ public class Ability : SkillRoot
 
     protected void GetAward()
     {
-        if (ElfLock)
+        if (ElfFlag)
         {
-            ElfLock = false;
+            ElfFlag = false;
 
             if (!string.IsNullOrEmpty(Anim))
             {
@@ -293,7 +297,7 @@ public class Ability : SkillRoot
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
             {
-                Manager.SkillList[i].ReceiveCool(NewSkillCD, false, false);
+                Manager.SkillList[i].Cool(NewSkillCD, false, false);
             }
         }
 
@@ -301,7 +305,7 @@ public class Ability : SkillRoot
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
             {
-                Manager.SkillList[i].ReceiveCool(NewSkillCdBuff, false, true);
+                Manager.SkillList[i].Cool(NewSkillCdBuff, false, true);
             }
         }
     }
@@ -310,7 +314,7 @@ public class Ability : SkillRoot
     {
         if (!string.IsNullOrEmpty(Elf))
         {
-            Manager.ElfLevel++;
+            Manager.AllElfLevel++;
         }
     }
 
@@ -322,26 +326,25 @@ public class Ability : SkillRoot
         }
     }
 
-    private int BannedSlotIndex = 4;
     protected void Zoom()
     {
         if (!string.IsNullOrEmpty(Elf))
         {
-            if (GardenManager.PlantList.Count <= Garden.CurPage * GardenManager.TotalSlotAmtInOnePage)
+            if (GardenManager.PlantSlotList.Count <= Garden.CurrentPage * GardenManager.TotalSlotInOnePage)
             {
                 return;
             }
             
-            GardenManager.ElfTimer = Random.Range(GardenManager.MinElfTime, GardenManager.MaxElfTime);
+            GardenManager.CreateElfTimer = Random.Range(GardenManager.MinCreateElfTime, GardenManager.MaxCreateElfTime);
 
-            Slot zoomSlot = GardenManager.PlantList.Random(1, false, false, slot => { return slot.Index >= Garden.CurPage* GardenManager.TotalSlotAmtInOnePage; })[0];
+            Slot zoomSlot = GardenManager.PlantSlotList.Random(1, false, false, slot => { return slot.Index >= Garden.CurrentPage* GardenManager.TotalSlotInOnePage; })[0];
 
-            if (zoomSlot.Index% GardenManager.TotalSlotAmtInOnePage == BannedSlotIndex)
+            if (zoomSlot.Index% GardenManager.TotalSlotInOnePage == BannedSlotIndexForZoomIn)
             {
                 return;
             }
 
-            Flower flower = zoomSlot.Flower;
+            Flower flower = zoomSlot.PlantFlower;
 
             flower.GetElf(GardenManager.ElfList.Back(0), 0, 0, 0, 0);
 
@@ -396,7 +399,7 @@ public class Ability : SkillRoot
     }
 
 
-    protected void Unlock()
+    public void Unlock()
     {
         Manager.Pay
         (
@@ -411,7 +414,7 @@ public class Ability : SkillRoot
 
                 if (FullID == "Ability1")
                 {
-                    Manager.Level = 1;
+                    Manager.GardenLevel = 1;
 
                     UnlockTab();
                 }
@@ -425,12 +428,12 @@ public class Ability : SkillRoot
     {
         AudioManager.PlayClip(AudioLabel.UseSkill);
 
-        ItemIcon.material = null;
+        SkillIcon.material = null;
         ItemStatus = SkillStatus.Upgrade;
 
         if (UnlockCur != Current.Free)
         {
-            UIManager.UpdateHint();
+            UIManager.UpdateManagePanelHint();
         }
 
         Level = 1;
@@ -440,7 +443,7 @@ public class Ability : SkillRoot
         GetSlot();
     }
 
-    protected void OnClick()
+    public void OnClick()
     {
         AudioManager.PlayClip(AudioLabel.ClickButton);
 
@@ -501,9 +504,9 @@ public class Ability : SkillRoot
                 {
                     Upgrade();
 
-                    ItemLab.text = GetDescription(0);
+                    DescriptionText.text = GetDescription(0);
 
-                    ItemBtnLab.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
+                    ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
 
                     ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
                     ResourceManager.SetText(ObjectLabel.Fe_Lab0, GetDescription(0));
@@ -515,7 +518,7 @@ public class Ability : SkillRoot
         }
     }
 
-    protected void Upgrade()
+    public void Upgrade()
     {
         Manager.Pay
         (
@@ -554,11 +557,11 @@ public class Ability : SkillRoot
 
         if (FullID == "Ability1")
         {
-            Manager.Level++;
+            Manager.GardenLevel++;
         }
     }
 
-    protected void UnlockAhead()
+    public void UnlockAhead()
     {
         Manager.Pay
         (
@@ -586,7 +589,7 @@ public class Ability : SkillRoot
         {
             ItemStatus = SkillStatus.UnLock;
 
-            UIManager.UpdateHint();
+            UIManager.UpdateManagePanelHint();
         }
     }
 
@@ -603,7 +606,7 @@ public class Ability : SkillRoot
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
             {
-                Manager.SkillList[i].ReceiveCool(-NewSkillCD, false, false);
+                Manager.SkillList[i].Cool(-NewSkillCD, false, false);
             }
         }
 
@@ -611,19 +614,19 @@ public class Ability : SkillRoot
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
             {
-                Manager.SkillList[i].ReceiveCool(-NewSkillCdBuff, false, true);
+                Manager.SkillList[i].Cool(-NewSkillCdBuff, false, true);
             }
         }
     }
 
     public override void UpdateStatus()
     {
-        if (!Manager.Complete)
+        if (!Manager.Inited)
         {
             return;
         }
 
-        if (Manager.Level >= UnlockLv)
+        if (Manager.GardenLevel >= UnlockLv)
         {
             if (ItemStatus == SkillStatus.Lock)
             {
@@ -635,7 +638,7 @@ public class Ability : SkillRoot
                 {
                     ItemStatus = SkillStatus.UnLock;
 
-                    UIManager.UpdateHint();
+                    UIManager.UpdateManagePanelHint();
                 }
             }
         }
@@ -649,9 +652,8 @@ public class Ability : SkillRoot
         return info;
     }
 
-    #region 解读器
 
-    protected double UpgradeAmtParse(string str)
+    protected double GetUpgradeAmt(string str)
     {
         if (string.IsNullOrEmpty(str))
         {
@@ -663,7 +665,6 @@ public class Ability : SkillRoot
         }
     }
 
-
     protected override string GetDescription(int offset)
     {
         float temp;
@@ -778,6 +779,4 @@ public class Ability : SkillRoot
 
         return stringBuilder.ToString();
     }
-
-    #endregion
 }

Assets/Script/Object/Skill/BigSkill.cs

@@ -11,68 +11,68 @@ public class BigSkill : Skill
 {
     #region Config
 
-    public int BarIndex;
-    public Text BarLab;
-    public Image BarBk0;
-    public Image BarBk1;
-    public Button BarBtn;
+    public int BigSkillIndex;
+    public Text Text;
+    public Image BK0;
+    public Image Bk1;
+    public Button Button;
 
     public SkillStatus BarStatus
     {
-        get { return BarStatus_; }
+        get { return barStatus; }
         set
         {
-            BarStatus_ = value;
+            barStatus = value;
 
-            if (BarStatus_ == SkillStatus.Cool)
+            if (barStatus == SkillStatus.Cool)
             {
-                BarBk0.SetActive(true);
-                BarBk1.SetActive(false);
+                BK0.SetActive(true);
+                Bk1.SetActive(false);
             }
-            else if (BarStatus_ == SkillStatus.UnLock)
+            else if (barStatus == SkillStatus.UnLock)
             {
-                BarBk0.SetActive(false);
-                BarBk1.SetActive(true);
+                BK0.SetActive(false);
+                Bk1.SetActive(true);
             }
-            else if (BarStatus_ == SkillStatus.Buy)
+            else if (barStatus == SkillStatus.Buy)
             {
-                BarBk0.SetActive(false);
-                BarBk1.SetActive(true);
+                BK0.SetActive(false);
+                Bk1.SetActive(true);
                 
-                BarBtn.interactable = true;
+                Button.interactable = true;
             }
         }
     }
+    public SkillStatus barStatus;
 
     public override SkillStatus ItemStatus
     {
-        get { return ItemStatus_; }
+        get { return itemStatus; }
         set
         {
-            ItemStatus_ = value;
+            itemStatus = value;
 
             if (SkillTab == SkillTab.Null)
             {
                 return;
             }
 
-            if (ItemStatus_ == SkillStatus.Lock)
+            if (itemStatus == SkillStatus.Lock)
             {
-                LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab0), "\n", new MulLanStr(LanguageLabel.UI__Fe_BtnLab4), UnlockLv);
+                LanguageManager.Add(ButtonTitle, new MulLanStr(LanguageLabel.UI__Fe_BtnLab0), "\n", new MulLanStr(LanguageLabel.UI__Fe_BtnLab4), UnlockLv);
             }
-            else if (ItemStatus_ == SkillStatus.UnLock)
+            else if (itemStatus == SkillStatus.UnLock)
             {
-                LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab1), "\n", Auxiliary.ImageParse(UnlockCur), UnlockAmt.ToString("0"));
+                LanguageManager.Add(ButtonTitle, new MulLanStr(LanguageLabel.UI__Fe_BtnLab1), "\n", Auxiliary.ImageParse(UnlockCur), UnlockAmt.ToString("0"));
             }
-            else if (ItemStatus_ == SkillStatus.Upgrade)
+            else if (itemStatus == SkillStatus.Upgrade)
             {
-                LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab2), "\n", Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt));
+                LanguageManager.Add(ButtonTitle, new MulLanStr(LanguageLabel.UI__Fe_BtnLab2), "\n", Auxiliary.ImageParse(UpgradeCur), Auxiliary.ShrinkNumberStr(NewUpgradeAmt));
             }
         }
     }
 
-    public SkillStatus BarStatus_;
-
+    public static int WatchADSkillID = 7;
     public static List<Text> BigSkillTexts = new List<Text>();
     public static List<Image> BigSkillBk0s = new List<Image>();
     public static List<Image> BigSkillBk1s = new List<Image>();
@@ -81,7 +81,7 @@ public class BigSkill : Skill
 
     public BigSkill(XmlAttributeCollection attribute) : base(attribute)
     {
-        BarIndex = Auxiliary.StringToInt(attribute[4].Value,0);
+        BigSkillIndex = Auxiliary.StringToInt(attribute[4].Value,0);
 
         SkillType = SkillType.BigSkill;
     }
@@ -93,7 +93,7 @@ public class BigSkill : Skill
 
         BarStatus = SkillStatus.Cool;
 
-        Manager.CoolList.Add(this);
+        Manager.CoolSkillList.Add(this);
 
         AnnulBuff();
     }
@@ -115,11 +115,11 @@ public class BigSkill : Skill
 
         if (timeSpan.Hours >= 1)
         {
-            BarLab.text = string.Format("{0} : {1}", timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
+            Text.text = string.Format("{0} : {1}", timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
         }
         else
         {
-            BarLab.text = string.Format("{0} : {1}", timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+            Text.text = string.Format("{0} : {1}", timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
         }
 
 
@@ -135,7 +135,7 @@ public class BigSkill : Skill
         }
     }
 
-    public override bool DoCool()
+    public override bool DoCD()
     {
         CoolTimer -= Time.deltaTime;
         
@@ -143,19 +143,19 @@ public class BigSkill : Skill
         
         if (timeSpan.Hours >= 1)
         {
-            BarLab.text = string.Format("{0} : {1}", timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
+            Text.text = string.Format("{0} : {1}", timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
         }
         else
         {
-            BarLab.text = string.Format("{0} : {1}", timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+            Text.text = string.Format("{0} : {1}", timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
         }
 
 
-        BarBk0.fillAmount = CoolTimer / CD;
+        BK0.fillAmount = CoolTimer / CD;
 
         if (CoolTimer <= 0)
         {
-            BarLab.text = "";
+            Text.text = "";
 
             BarStatus = SkillStatus.Buy;
 
@@ -174,11 +174,11 @@ public class BigSkill : Skill
         {
             AnnulBuff();
 
-            Manager.UseList.Remove(this);
+            Manager.UsingSkillList.Remove(this);
         }
         else if (BarStatus == SkillStatus.Cool)
         {
-            Manager.CoolList.Remove(this);
+            Manager.CoolSkillList.Remove(this);
         }
     }
 
@@ -188,10 +188,10 @@ public class BigSkill : Skill
         UseTimer = float.Parse(attribute[6].Value);
         CoolTimer = float.Parse(attribute[5].Value);
         
-        BarBk1.material = Lib.GrayMat;
+        Bk1.material = Lib.GrayMat;
 
-        BarStatus_ = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[3].Value);
-        ItemStatus_ = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);
+        barStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[3].Value);
+        itemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);
         
         NewPlus = Plus;
         NewPerson = Person;
@@ -204,10 +204,10 @@ public class BigSkill : Skill
         NewUpgradeAmt = UpgradeAmt;
         NewCoinOnceBuff = CoinOnceBuff;
 
-        BarBk1.sprite = Icon;
+        Bk1.sprite = Icon;
 
-        BarBtn.onClick.RemoveAllListeners();
-        BarBtn.onClick.AddListener(Buy);
+        Button.onClick.RemoveAllListeners();
+        Button.onClick.AddListener(Buy);
 
         if (SkillTab != SkillTab.Null)
         {
@@ -216,9 +216,9 @@ public class BigSkill : Skill
                 NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString());
             }
             
-            if (BarStatus_ != SkillStatus.Lock && BarStatus_ != SkillStatus.UnLock)
+            if (barStatus != SkillStatus.Lock && barStatus != SkillStatus.UnLock)
             {
-                ItemIcon.material = null;
+                SkillIcon.material = null;
 
                 UpgradeValue(ref NewPlus, UpgradePlus, Level - 1);
                 UpgradeValue(ref NewPersonBuff, UpgradePerson, Level - 1);
@@ -233,32 +233,32 @@ public class BigSkill : Skill
             }
             else
             {
-                ItemIcon.material = Lib.GrayMat;
+                SkillIcon.material = Lib.GrayMat;
             }
 
-            ItemBtn.onClick.RemoveAllListeners();
-            ItemBtn.onClick.AddListener(OnClick);
+            button.onClick.RemoveAllListeners();
+            button.onClick.AddListener(OnClick);
 
-            ItemLab.text = GetDescription(0);
+            DescriptionText.text = GetDescription(0);
         }
 
-        if (BarStatus_ == SkillStatus.Use)
+        if (barStatus == SkillStatus.Use)
         {
             GetBuff();
 
             if (UseTimer < elapse)
             {
-                Manager.UseList.Remove(this);
+                Manager.UsingSkillList.Remove(this);
 
                 if (useList.Count > 0)
                 {
-                    if (UseTimer < Manager.CircleTimer)
+                    if (UseTimer < Manager.IncomeCircleTimer)
                     {
                         useList[0].UniqueAdd(this);
                     }
                     else
                     {
-                        int circle = 1 + Mathf.FloorToInt((UseTimer - Manager.CircleTimer) / Manager.CircleTime);
+                        int circle = 1 + Mathf.FloorToInt((UseTimer - Manager.IncomeCircleTimer) / Manager.IncomeCircleTime);
 
                         useList[circle].UniqueAdd(this);
                     }
@@ -268,31 +268,31 @@ public class BigSkill : Skill
             {
                 UseTimer -= elapse;
 
-                BarBk1.SetActive(true);
+                Bk1.SetActive(true);
             }
         }
-        else if (BarStatus_ == SkillStatus.Cool)
+        else if (barStatus == SkillStatus.Cool)
         {
             CoolTimer -= elapse;
 
-            Manager.CoolList.Add(this);
+            Manager.CoolSkillList.Add(this);
         }
 
-        if (BarStatus_ != SkillStatus.UnLock)
+        if (barStatus != SkillStatus.UnLock)
         {
-            BarBk1.material = null;
+            Bk1.material = null;
         }
 
-        if (ItemStatus_ == SkillStatus.UnLock)
+        if (itemStatus == SkillStatus.UnLock)
         {
-            UIManager.UpdateHint();
+            UIManager.UpdateManagePanelHint();
         }
 
         BarStatus = BarStatus;
         ItemStatus = ItemStatus;
     }
 
-    public override void ReceiveCool(float amt, bool current, bool buff)
+    public override void Cool(float amt, bool current, bool buff)
     {
         if (!CoolLock)
         {
@@ -330,12 +330,12 @@ public class BigSkill : Skill
 
     public override void UpdateStatus()
     {
-        if (!Manager.Complete)
+        if (!Manager.Inited)
         {
             return;
         }
 
-        if (Manager.Level >= UnlockLv)
+        if (Manager.GardenLevel >= UnlockLv)
         {
             if (SkillTab == SkillTab.Null)
             {
@@ -356,7 +356,7 @@ public class BigSkill : Skill
                     {
                         ItemStatus = SkillStatus.UnLock;
 
-                        UIManager.UpdateHint();
+                        UIManager.UpdateManagePanelHint();
                     }
                 }
             }
@@ -385,10 +385,10 @@ public class BigSkill : Skill
             BigSkillBk1s.Add(ResourceManager.Get<Image>(ObjectLabel.F_SkillBk41));
         }
 
-        BarLab = BigSkillTexts[BarIndex-1];
-        BarBk0 = BigSkillBk0s[BarIndex-1];
-        BarBk1 = BigSkillBk1s[BarIndex-1];
-        BarBtn = BarBk1.GetComponent<Button>();
+        Text = BigSkillTexts[BigSkillIndex-1];
+        BK0 = BigSkillBk0s[BigSkillIndex-1];
+        Bk1 = BigSkillBk1s[BigSkillIndex-1];
+        Button = Bk1.GetComponent<Button>();
     }
 
 
@@ -408,17 +408,17 @@ public class BigSkill : Skill
 
                 if (SkillTab != SkillTab.Null)
                 {
-                    ItemIcon.material = null;
+                    SkillIcon.material = null;
                 }
 
                 if (UnlockCur != Current.Free)
                 {
-                    UIManager.UpdateHint();
+                    UIManager.UpdateManagePanelHint();
                 }
 
                 Level = 1;
 
-                BarBk1.material = null;
+                Bk1.material = null;
             },
             StaticsManager.ItemID.解锁技能,
             StaticsManager.ConsumeModule.Shop
@@ -441,7 +441,7 @@ public class BigSkill : Skill
                 if (BarStatus == SkillStatus.Use)
                 {
                     AnnulBuff();
-                    Manager.UseList.Remove(this);
+                    Manager.UsingSkillList.Remove(this);
                 }
 
                 NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString("0.00"));
@@ -468,15 +468,14 @@ public class BigSkill : Skill
     }
 
 
-    private int WatchADSkillID = 7;
     protected override void Buy()
     {
-        if (ID_ == WatchADSkillID)
+        if (ID == WatchADSkillID)
         {
             StaticsManager.GetInstance().AdClicked(0);
         }
 
-        if (!HttpManager.Connect)
+        if (!HttpManager.IsConnect)
         {
             ResourceManager.Get(ObjectLabel.Fg_Reconnect).TweenForCG();
 
@@ -494,14 +493,14 @@ public class BigSkill : Skill
 
                 ResourceManager.GetLightwall();
 
-                Manager.SkillAmt++;
+                Manager.UseSkillAmt++;
 
                 UseTimer = NewDuration - 1;
 
                 GetBuff();
                 GetAward();
 
-                InfoBoxManager.GardenInfoBox.Show(string.Format("{0}{1}", Language.GetStr(LanguageLabel.UI__J_Info1), Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID))), 10f, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Display(string.Format("{0}{1}", Language.GetStr(LanguageLabel.UI__J_Info1), Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID))), 10f, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
             },
             StaticsManager.ItemID.使用技能,
             StaticsManager.ConsumeModule.Shop
@@ -510,7 +509,7 @@ public class BigSkill : Skill
 
     protected override void GetBuff()
     {
-        BarBtn.interactable = false;
+        Button.interactable = false;
 
         if (UseTimer.Equal(-1))
         {
@@ -520,7 +519,7 @@ public class BigSkill : Skill
         {
             BarStatus = SkillStatus.Use;
 
-            Manager.UseList.Add(this);
+            Manager.UsingSkillList.Add(this);
         }
 
         Manager.SkillPlus += NewPlus;
@@ -532,7 +531,7 @@ public class BigSkill : Skill
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
             {
-                Manager.SkillList[i].ReceiveCool(NewSkillCD, true, false);
+                Manager.SkillList[i].Cool(NewSkillCD, true, false);
             }
         }
 
@@ -540,7 +539,7 @@ public class BigSkill : Skill
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
             {
-                Manager.SkillList[i].ReceiveCool(NewSkillCdBuff, true, true);
+                Manager.SkillList[i].Cool(NewSkillCdBuff, true, true);
             }
         }
     }
@@ -605,9 +604,9 @@ public class BigSkill : Skill
                 {
                     Upgrade();
 
-                    ItemLab.text = GetDescription(0);
+                    DescriptionText.text = GetDescription(0);
 
-                    ItemBtnLab.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
+                    ButtonTitle.text = Language.GetStr(LanguageLabel.UI__Fe_BtnLab2) + "\n" + Auxiliary.ImageParse(UpgradeCur) + Auxiliary.ShrinkNumberStr(NewUpgradeAmt);
 
                     ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
                     ResourceManager.SetText(ObjectLabel.Fe_Lab0, GetDescription(0));

Assets/Script/Object/Skill/Pack.cs

@@ -19,6 +19,7 @@ public class Pack : SkillRoot
             return "Pack";
         }
     }
+
     public override string Name
     {
         get
@@ -59,29 +60,29 @@ public class Pack : SkillRoot
 
     public override SkillStatus ItemStatus
     {
-        get { return ItemStatus_; }
+        get { return itemStatus; }
         set
         {
-            ItemStatus_ = value;
+            itemStatus = value;
 
-            if (ItemStatus_ == SkillStatus.Buy)
+            if (itemStatus == SkillStatus.Buy)
             {
-                ItemBtn.interactable = true;
+                button.interactable = true;
 
                 SkillItem.SetActive(true);
 
                 if (!string.IsNullOrEmpty(Label))
                 {
-                    LanguageManager.Add(ItemBtnLab, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.UI, Label)), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                    LanguageManager.Add(ButtonTitle, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.UI, Label)), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
                 }
                 else
                 {
-                    LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab3), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                    LanguageManager.Add(ButtonTitle, new MulLanStr(LanguageLabel.UI__Fe_BtnLab3), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
                 }
             }
-            else if (ItemStatus_ == SkillStatus.Lock)
+            else if (itemStatus == SkillStatus.Lock)
             {
-                ItemBtn.interactable = false;
+                button.interactable = false;
 
                 SkillItem.SetActive(false);
             }
@@ -94,8 +95,8 @@ public class Pack : SkillRoot
     {
         #region 配置
 
-        ID_ = int.Parse(attribute[0].Value);
-        Icon_ = attribute[14].Value;
+        ID = int.Parse(attribute[0].Value);
+        icon = attribute[14].Value;
         Anim = attribute[15].Value;
         Label = attribute[16].Value;
         Flower = attribute[9].Value;
@@ -137,7 +138,7 @@ public class Pack : SkillRoot
         {
             for (int j = 0; j < Manager.SkillList.Count; j++)
             {
-                Manager.SkillList[j].ReceiveCool(-SkillCD, false, false);
+                Manager.SkillList[j].Cool(-SkillCD, false, false);
             }
         }
 
@@ -145,7 +146,7 @@ public class Pack : SkillRoot
         {
             for (int j = 0; j < Manager.SkillList.Count; j++)
             {
-                Manager.SkillList[j].ReceiveCool(-SkillCdBuff, false, true);
+                Manager.SkillList[j].Cool(-SkillCdBuff, false, true);
             }
         }
     }
@@ -166,7 +167,7 @@ public class Pack : SkillRoot
         }
 
         Level = int.Parse(attribute[3].Value);
-        ItemStatus_ = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);
+        itemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);
 
 
         for (int i = 0; i < Level; i++)
@@ -174,8 +175,8 @@ public class Pack : SkillRoot
             GetBuff();
         }
 
-        ItemBtn.onClick.RemoveAllListeners();
-        ItemBtn.onClick.AddListener(OnClick);
+        button.onClick.RemoveAllListeners();
+        button.onClick.AddListener(OnClick);
 
 
         //if (!string.IsNullOrEmpty(Label))
@@ -185,12 +186,12 @@ public class Pack : SkillRoot
         //    ManaLan.Add(IconLab1, new LanStr("UI", Label));
         //}
 
-        ItemLab.text = GetDescription(0);
+        DescriptionText.text = GetDescription(0);
 
-        LanguageManager.Add(ItemTit, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)));
+        LanguageManager.Add(TitleText, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)));
 
 
-        IAPManager.ProductActionDic.UniqueAdd(FullID, ()=>OnBuySucceed());
+        IAPManager.BuyProductCallbackDictionary.UniqueAdd(FullID, ()=>OnBuySucceed());
 
         ItemStatus = ItemStatus;
 
@@ -199,17 +200,17 @@ public class Pack : SkillRoot
 
     public override void UpdateStatus()
     {
-        if (!Manager.Complete)
+        if (!Manager.Inited)
         {
             return;
         }
 
-        if (Lock && HttpManager.PackLock && Level >= 1)
+        if (Lock && HttpManager.BuyPackLimitFlag && Level >= 1)
         {
             return;
         }
 
-        ItemLab.text = GetDescription(0);
+        DescriptionText.text = GetDescription(0);
 
         if (MaxUseLv == MinUseLv)
         {
@@ -217,7 +218,7 @@ public class Pack : SkillRoot
         }
         else
         {
-            if (Manager.Level > MaxUseLv || Manager.Level < MinUseLv)
+            if (Manager.GardenLevel > MaxUseLv || Manager.GardenLevel < MinUseLv)
             {
                 ItemStatus = SkillStatus.Lock;
             }
@@ -240,7 +241,7 @@ public class Pack : SkillRoot
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
             {
-                Manager.SkillList[i].ReceiveCool(SkillCD, false, false);
+                Manager.SkillList[i].Cool(SkillCD, false, false);
             }
         }
 
@@ -248,18 +249,18 @@ public class Pack : SkillRoot
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
             {
-                Manager.SkillList[i].ReceiveCool(SkillCdBuff, false, true);
+                Manager.SkillList[i].Cool(SkillCdBuff, false, true);
             }
         }
     }
 
     public void SetActive()
     {
-        bool active = !(Lock && HttpManager.PackLock);
+        bool active = !(Lock && HttpManager.BuyPackLimitFlag);
 
         if (active)
         {
-            ItemBtn.interactable = true;
+            button.interactable = true;
 
             ItemStatus = ItemStatus;
         }
@@ -267,9 +268,9 @@ public class Pack : SkillRoot
         {
             if (Level > 0)
             {
-                ItemBtn.interactable = false;
+                button.interactable = false;
 
-                LanguageManager.Add(ItemBtnLab, Language.GetStr(LanguageLabel.UI__Fe_BtnLab9));
+                LanguageManager.Add(ButtonTitle, Language.GetStr(LanguageLabel.UI__Fe_BtnLab9));
             }
         }
     }
@@ -282,7 +283,7 @@ public class Pack : SkillRoot
 
         ResourceManager.SetText(ObjectLabel.Fe_Tit, Name);
 
-        ResourceManager.SetSprite(ObjectLabel.Fe_Icon, ItemIcon.sprite);
+        ResourceManager.SetSprite(ObjectLabel.Fe_Icon, SkillIcon.sprite);
 
         if (ItemStatus == SkillStatus.Buy)
         {
@@ -324,7 +325,7 @@ public class Pack : SkillRoot
         {
             for (int i = 0; i < Flowers.Length; i++)
             {
-                FlowerInfo flowerInfo = GardenManager.FlowerInfoDic[int.Parse(Flowers[i])];
+                FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[int.Parse(Flowers[i])];
 
                 flowerInfo.Add();
                 tempFlower += string.Format("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.FlowerSprite, flowerInfo.Name);
@@ -336,7 +337,7 @@ public class Pack : SkillRoot
 
         if (!string.IsNullOrEmpty(CoinFml))
         {
-            int coin = (int) Auxiliary.FmlParse(CoinFml, "l", Manager.Level.ToString(), "c", Manager.CoinPerson.ToString("0.000"));
+            int coin = (int) Auxiliary.FmlParse(CoinFml, "l", Manager.GardenLevel.ToString(), "c", Manager.CoinPerson.ToString("0.000"));
 
             Manager.AddCoin(coin, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Shop);
 
@@ -362,7 +363,7 @@ public class Pack : SkillRoot
 
         if (!string.IsNullOrEmpty(str))
         {
-            InfoBoxManager.GardenInfoBox.Show(str, 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Display(str, 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
         }
 
 
@@ -372,7 +373,7 @@ public class Pack : SkillRoot
 
         if (BuyCur == Current.Cash)
         {
-            HttpManager.Save();
+            HttpManager.UploadConfig();
         }
 
         GetBuff();
@@ -381,13 +382,11 @@ public class Pack : SkillRoot
 
         if (getGift)
         {
-            ThanksGift.GetAllGift(ID_);
+            ThanksGift.GetAllGift(ID);
         }
     }
 
 
-    #region 解读器
-
     protected int MinLevelParse(string str)
     {
         if (string.IsNullOrEmpty(str))
@@ -430,7 +429,7 @@ public class Pack : SkillRoot
 
                 if (!string.IsNullOrEmpty(CoinFml))
                 {
-                    stringBuilder.Append(Auxiliary.FmlParse(CoinFml, "l", Manager.Level.ToString(), "c", Manager.CoinPerson.ToString("0.000")).ToString("0"));
+                    stringBuilder.Append(Auxiliary.FmlParse(CoinFml, "l", Manager.GardenLevel.ToString(), "c", Manager.CoinPerson.ToString("0.000")).ToString("0"));
                 }
 
                 #endregion
@@ -443,7 +442,7 @@ public class Pack : SkillRoot
                 {
                     for (int j = 0; j < Flowers.Length; j++)
                     {
-                        FlowerInfo flowerInfo = GardenManager.FlowerInfoDic[int.Parse(Flowers[j])];
+                        FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[int.Parse(Flowers[j])];
                         stringBuilder.Append(Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.FlowerName, flowerInfo.FullID)));
 
                         if (j != Flowers.Length - 1)
@@ -508,6 +507,4 @@ public class Pack : SkillRoot
         
         return stringBuilder.ToString();
     }
-
-    #endregion
 }

Assets/Script/Object/Skill/Skill.cs

@@ -16,7 +16,7 @@ public class Skill : SkillRoot
 
     public float UnlockAheadAmt
     {
-        get { return UnlockAheadBaseAmt + (UnlockLv - Manager.Level - 1) * UnlockAheadDeltaAmt; }
+        get { return UnlockAheadBaseAmt + (UnlockLv - Manager.GardenLevel - 1) * UnlockAheadDeltaAmt; }
     }
     public override string FullIDPrefix
     {
@@ -80,37 +80,37 @@ public class Skill : SkillRoot
 
     public override SkillStatus ItemStatus
     {
-        get { return ItemStatus_; }
+        get { return itemStatus; }
         set
         {
-            ItemStatus_ = value;
+            itemStatus = value;
 
-            if (ItemStatus_ == SkillStatus.Buy)
+            if (itemStatus == SkillStatus.Buy)
             {
-                ItemBtn.interactable = true;
+                button.interactable = true;
 
                 if (BuyCur == Current.AD)
                 {
-                    LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.Common__AD));
+                    LanguageManager.Add(ButtonTitle, new MulLanStr(LanguageLabel.Common__AD));
                 }
                 else
                 {
-                    LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab3), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                    LanguageManager.Add(ButtonTitle, new MulLanStr(LanguageLabel.UI__Fe_BtnLab3), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
                 }
             }
-            else if (ItemStatus_ == SkillStatus.Use)
+            else if (itemStatus == SkillStatus.Use)
             {
-                ItemBtn.interactable = false;
+                button.interactable = false;
             }
-            else if (ItemStatus_ == SkillStatus.Lock)
+            else if (itemStatus == SkillStatus.Lock)
             {
-                ItemBtn.interactable = true;
+                button.interactable = true;
 
-                LanguageManager.Add(ItemBtnLab, new MulLanStr(LanguageLabel.UI__Fe_BtnLab0), "\n", new MulLanStr(LanguageLabel.UI__Fe_BtnLab4), UnlockLv.ToString());
+                LanguageManager.Add(ButtonTitle, new MulLanStr(LanguageLabel.UI__Fe_BtnLab0), "\n", new MulLanStr(LanguageLabel.UI__Fe_BtnLab4), UnlockLv.ToString());
             }
-            else if (ItemStatus_ == SkillStatus.Cool)
+            else if (itemStatus == SkillStatus.Cool)
             {
-                ItemBtn.interactable = false;
+                button.interactable = false;
             }
         }
     }
@@ -121,8 +121,8 @@ public class Skill : SkillRoot
     {
         #region 配置
 
-        ID_ = int.Parse(attribute[0].Value);
-        Icon_ = attribute[31].Value;
+        ID = int.Parse(attribute[0].Value);
+        icon = attribute[31].Value;
         Anim = attribute[32].Value;
         Label = attribute[33].Value;
 
@@ -147,7 +147,7 @@ public class Skill : SkillRoot
 
         SkillTab = SkillClassParse(attribute[2].Value);
         CoolLock = Auxiliary.StringToBool(attribute[5].Value, false);
-        UpgradeAmt = UpgradeAmtParse(attribute[23].Value);
+        UpgradeAmt = GetUpgradeAmt(attribute[23].Value);
         
         BuyCur = Auxiliary.CurrentParse(attribute[20].Value);
         UnlockCur = Auxiliary.CurrentParse(attribute[17].Value);
@@ -176,7 +176,7 @@ public class Skill : SkillRoot
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
             {
-                Manager.SkillList[i].ReceiveCool(-NewSkillCD, true, false);
+                Manager.SkillList[i].Cool(-NewSkillCD, true, false);
             }
         }
 
@@ -184,12 +184,12 @@ public class Skill : SkillRoot
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
             {
-                Manager.SkillList[i].ReceiveCool(-NewSkillCdBuff, true, true);
+                Manager.SkillList[i].Cool(-NewSkillCdBuff, true, true);
             }
         }
     }
 
-    public virtual bool DoCool()
+    public virtual bool DoCD()
     {
         CoolTimer -= Time.deltaTime;
         
@@ -197,11 +197,11 @@ public class Skill : SkillRoot
 
         if (timeSpan.Hours >= 1)
         {
-            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr(LanguageLabel.UI__Fe_BtnLab6), Language.GetStr(LanguageLabel.UI__Fe_BtnLab7), timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
+            ButtonTitle.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr(LanguageLabel.UI__Fe_BtnLab6), Language.GetStr(LanguageLabel.UI__Fe_BtnLab7), timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
         }
         else
         {
-            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr(LanguageLabel.UI__Fe_BtnLab6), Language.GetStr(LanguageLabel.UI__Fe_BtnLab7), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+            ButtonTitle.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr(LanguageLabel.UI__Fe_BtnLab6), Language.GetStr(LanguageLabel.UI__Fe_BtnLab7), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
         }
 
 
@@ -226,11 +226,11 @@ public class Skill : SkillRoot
 
         if (timeSpan.Hours >= 1)
         {
-            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr(LanguageLabel.UI__Fe_BtnLab8), Language.GetStr(LanguageLabel.UI__Fe_BtnLab7), timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
+            ButtonTitle.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr(LanguageLabel.UI__Fe_BtnLab8), Language.GetStr(LanguageLabel.UI__Fe_BtnLab7), timeSpan.Hours.ToString("00"), timeSpan.Minutes.ToString("00"));
         }
         else
         {
-            ItemBtnLab.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr(LanguageLabel.UI__Fe_BtnLab8), Language.GetStr(LanguageLabel.UI__Fe_BtnLab7), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
+            ButtonTitle.text = string.Format("{0}\n{1}{2}:{3}", Language.GetStr(LanguageLabel.UI__Fe_BtnLab8), Language.GetStr(LanguageLabel.UI__Fe_BtnLab7), timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
         }
 
 
@@ -252,23 +252,23 @@ public class Skill : SkillRoot
 
         ItemStatus = SkillStatus.Cool;
 
-        Manager.CoolList.Add(this);
+        Manager.CoolSkillList.Add(this);
 
         AnnulBuff();
     }
 
     public override void UpdateStatus()
     {
-        if (!Manager.Complete)
+        if (!Manager.Inited)
         {
             return;
         }
 
-        if (Manager.Level >= UnlockLv)
+        if (Manager.GardenLevel >= UnlockLv)
         {
             if (ItemStatus == SkillStatus.Lock)
             {
-                ItemIcon.material = null;
+                SkillIcon.material = null;
 
                 ItemStatus = SkillStatus.Buy;
             }
@@ -299,7 +299,7 @@ public class Skill : SkillRoot
 
         if (!string.IsNullOrEmpty(str))
         {
-            InfoBoxManager.GardenInfoBox.Show(sb.ToString(), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Display(sb.ToString(), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
         }
     }
 
@@ -313,7 +313,7 @@ public class Skill : SkillRoot
         {
             ItemStatus = SkillStatus.Use;
 
-            Manager.UseList.Add(this);
+            Manager.UsingSkillList.Add(this);
         }
 
         Manager.SkillPlus += NewPlus;
@@ -325,7 +325,7 @@ public class Skill : SkillRoot
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
             {
-                Manager.SkillList[i].ReceiveCool(NewSkillCD, true, false);
+                Manager.SkillList[i].Cool(NewSkillCD, true, false);
             }
         }
 
@@ -333,7 +333,7 @@ public class Skill : SkillRoot
         {
             for (int i = 0; i < Manager.SkillList.Count; i++)
             {
-                Manager.SkillList[i].ReceiveCool(NewSkillCdBuff, true, true);
+                Manager.SkillList[i].Cool(NewSkillCdBuff, true, true);
             }
         }
     }
@@ -341,11 +341,11 @@ public class Skill : SkillRoot
 
     protected virtual void Buy()
     {
-        if (ID_ == 5)
+        if (ID == 5)
         {
             StaticsManager.GetInstance().AdClicked(1);
         }
-        else if (ID_ == 6)
+        else if (ID == 6)
         {
             StaticsManager.GetInstance().AdClicked(2);
         }
@@ -361,7 +361,7 @@ public class Skill : SkillRoot
 
                 if (BuyCur != Current.AD)
                 {
-                    Manager.SkillAmt++;
+                    Manager.UseSkillAmt++;
                 }
 
                 UseTimer = NewDuration - 1;
@@ -369,7 +369,7 @@ public class Skill : SkillRoot
                 GetBuff();
                 GetAward();
 
-                InfoBoxManager.GardenInfoBox.Show(string.Format("{0}{1}", Language.GetStr(LanguageLabel.UI__J_Info1), Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID))), 10f, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
+                InfoBoxManager.GardenInfoBox.Display(string.Format("{0}{1}", Language.GetStr(LanguageLabel.UI__J_Info1), Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID))), 10f, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
             },
             StaticsManager.ItemID.使用技能, 
             StaticsManager.ConsumeModule.Shop
@@ -449,7 +449,7 @@ public class Skill : SkillRoot
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                ItemIcon.material = null;
+                SkillIcon.material = null;
 
                 ItemStatus = SkillStatus.Buy;
             },
@@ -465,11 +465,11 @@ public class Skill : SkillRoot
         {
             AnnulBuff();
 
-            Manager.UseList.Remove(this);
+            Manager.UsingSkillList.Remove(this);
         }
         else if (ItemStatus == SkillStatus.Cool)
         {
-            Manager.CoolList.Remove(this);
+            Manager.CoolSkillList.Remove(this);
         }
     }
 
@@ -479,7 +479,7 @@ public class Skill : SkillRoot
         UseTimer = float.Parse(attribute[5].Value);
         CoolTimer = float.Parse(attribute[4].Value);
         
-        ItemStatus_ = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);
+        itemStatus = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);
 
         NewPlus = Plus;
         NewPerson = Person;
@@ -492,32 +492,32 @@ public class Skill : SkillRoot
         NewUpgradeAmt = UpgradeAmt;
         NewCoinOnceBuff = CoinOnceBuff;
 
-        if (ItemStatus_ == SkillStatus.Lock || ItemStatus_ == SkillStatus.UnLock)
+        if (itemStatus == SkillStatus.Lock || itemStatus == SkillStatus.UnLock)
         {
-            ItemIcon.material = Lib.GrayMat;
+            SkillIcon.material = Lib.GrayMat;
         }
         else
         {
-            ItemIcon.material = null;
+            SkillIcon.material = null;
         }
 
-        if (ItemStatus_ == SkillStatus.Use)
+        if (itemStatus == SkillStatus.Use)
         {
             GetBuff();
 
             if (UseTimer < elapse)
             {
-                Manager.UseList.Remove(this);
+                Manager.UsingSkillList.Remove(this);
 
                 if (useList.Count > 0)
                 {
-                    if (UseTimer < Manager.CircleTimer)
+                    if (UseTimer < Manager.IncomeCircleTimer)
                     {
                         useList[0].UniqueAdd(this);
                     }
                     else
                     {
-                        int circle = 1 + Mathf.FloorToInt((UseTimer - Manager.CircleTimer)/Manager.CircleTime);
+                        int circle = 1 + Mathf.FloorToInt((UseTimer - Manager.IncomeCircleTimer)/Manager.IncomeCircleTime);
 
                         useList[circle].UniqueAdd(this);
                     }
@@ -528,22 +528,22 @@ public class Skill : SkillRoot
                 UseTimer -= elapse;
             }
         }
-        else if (ItemStatus_ == SkillStatus.Cool)
+        else if (itemStatus == SkillStatus.Cool)
         {
             CoolTimer -= elapse;
 
-            Manager.CoolList.Add(this);
+            Manager.CoolSkillList.Add(this);
         }
 
-        ItemBtn.onClick.RemoveAllListeners();
-        ItemBtn.onClick.AddListener(OnClick);
+        button.onClick.RemoveAllListeners();
+        button.onClick.AddListener(OnClick);
 
-        ItemLab.text = GetDescription(0);
+        DescriptionText.text = GetDescription(0);
 
         ItemStatus = ItemStatus;
     }
 
-    public override void ReceiveCool(float amt, bool current, bool buff)
+    public override void Cool(float amt, bool current, bool buff)
     {
         if (!CoolLock)
         {
@@ -580,9 +580,7 @@ public class Skill : SkillRoot
     }
 
 
-    #region 解读器
-
-    protected double UpgradeAmtParse(string str)
+    protected double GetUpgradeAmt(string str)
     {
         if (string.IsNullOrEmpty(str))
         {
@@ -729,6 +727,4 @@ public class Skill : SkillRoot
 
         return stringBuilder.ToString();
     }
-
-    #endregion
 }

Assets/Script/Object/Skill/SkillRoot.cs

@@ -45,9 +45,15 @@ public enum SkillStatus
 
 public class SkillItemLabel
 {
-    public static string Btn = "Btn";
-    public static string Arrow0 = "Arrow0";
-    public static string Arrow1 = "Arrow1";
+    public static string Button = "Button";
+    public static string ArrowPosition = "ArrowPosition";
+    public static string ArrowDestination = "ArrowDestination";
+    public static string Title = "Title";
+    public static string Description = "Description";
+    public static string LabelText = "LabelText";
+    public static string SkillIcon = "SkillIcon";
+    public static string LabelIcon = "LabelIcon";
+    public static string ButtonTitle = "ButtonTitle";
 }
 
 public abstract class SkillRoot
@@ -60,9 +66,11 @@ public abstract class SkillRoot
     {
         get
         {
-            return ResourceManager.LoadSprite(Icon_, Folder.UI);
+            return ResourceManager.LoadSprite(icon, Folder.UI);
         }
     }
+    public string icon;
+
     public string Desc
     {
         get
@@ -70,10 +78,13 @@ public abstract class SkillRoot
             return Language.GetStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillDesc, FullID));
         }
     }
+
     public string FullID
     {
-        get { return FullIDPrefix + ID_; }
+        get { return FullIDPrefix + ID; }
     }
+    public int ID;
+
     public virtual string FullIDPrefix
     {
         get { throw new Exception(); }
@@ -93,19 +104,16 @@ public abstract class SkillRoot
         }
     }
 
-    public int ID_;
-    public string Icon_;
-
     public int ItemIndex;
 
     #endregion
 
     public virtual int Level
     {
-        get { return Level_; }
+        get { return level; }
         set
         {
-            Level_ = value;
+            level = value;
 
             if (SkillTab == SkillTab.Null)
             {
@@ -114,24 +122,23 @@ public abstract class SkillRoot
 
             if (Level == 0)
             {
-                LanguageManager.Add(ItemTit, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)));
+                LanguageManager.Add(TitleText, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)));
             }
             else
             {
-                LanguageManager.Add(ItemTit, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)), Level);
+                LanguageManager.Add(TitleText, new MulLanStr(LabelUtility.CombineLanguageLabel(LanguageLabel.SkillName, FullID)), Level);
             }
         }
     }
+    public int level;
 
-    public int Level_;
-
-    public Text ItemTit;
-    public Text ItemLab;
-    public Text IconLab1;
-    public Text ItemBtnLab;
-    public Image ItemIcon;
-    public Image ItemIcon1;
-    public Button ItemBtn;
+    public Text TitleText;
+    public Text DescriptionText;
+    public Text LabelText;
+    public Text ButtonTitle;
+    public Image SkillIcon;
+    public Image LabelIcon;
+    public Button button;
 
     public SkillTab SkillTab;
     public SkillType SkillType;
@@ -140,14 +147,13 @@ public abstract class SkillRoot
 
     public virtual SkillStatus ItemStatus
     {
-        get { return ItemStatus_; }
+        get { return itemStatus; }
         set
         {
-            ItemStatus_ = value;
+            itemStatus = value;
         }
     }
-
-    public SkillStatus ItemStatus_;
+    public SkillStatus itemStatus;
 
     #endregion
 
@@ -193,22 +199,22 @@ public abstract class SkillRoot
 
         Auxiliary.CompileDic(SkillItem, childDic);
 
-        ItemTit = childDic["Tit"].GetComponent<Text>();
-        ItemBtn = childDic["Btn"].GetComponent<Button>();
-        ItemLab = childDic["Lab"].GetComponent<Text>();
-        IconLab1 = childDic["IconLab1"].GetComponent<Text>();
-        ItemIcon = childDic["Icon"].GetComponent<Image>();
-        ItemIcon1 = childDic["Icon1"].GetComponent<Image>();
-        ItemBtnLab = childDic["BtnLab"].GetComponent<Text>();
+        TitleText = childDic[SkillItemLabel.Title].GetComponent<Text>();
+        button = childDic[SkillItemLabel.Button].GetComponent<Button>();
+        DescriptionText = childDic[SkillItemLabel.Description].GetComponent<Text>();
+        LabelText = childDic[SkillItemLabel.LabelText].GetComponent<Text>();
+        SkillIcon = childDic[SkillItemLabel.SkillIcon].GetComponent<Image>();
+        LabelIcon = childDic[SkillItemLabel.LabelIcon].GetComponent<Image>();
+        ButtonTitle = childDic[SkillItemLabel.ButtonTitle].GetComponent<Text>();
 
-        ItemIcon.sprite = Icon;
+        SkillIcon.sprite = Icon;
     }
 
     public virtual void SwitchLanguage()
     {
         if (SkillTab != SkillTab.Null)
         {
-            ItemLab.text = GetDescription(0);
+            DescriptionText.text = GetDescription(0);
         }
     }
 
@@ -223,7 +229,7 @@ public abstract class SkillRoot
         throw new Exception();
     }
 
-    public virtual void ReceiveCool(float amt, bool current, bool buff)
+    public virtual void Cool(float amt, bool current, bool buff)
     {
         
     }
@@ -356,10 +362,4 @@ public abstract class SkillRoot
     }
 
     #endregion
-}
-
-#region DebugList
-
-//语言切换
-
-#endregion
+}

Assets/Script/Object/Slot.cs

@@ -16,16 +16,17 @@ public class Slot : Regist
 
     public int ID
     {
-        get { return FlowerInfo.ID_; }
+        get { return PlantFlowerInfo.ID; }
     }
+
     public bool Lock
     {
-        get { return Lock_; }
+        get { return lock_; }
         set
         {
-            Lock_ = value;
+            lock_ = value;
 
-            if (Lock_)
+            if (lock_)
             {
                 Icon.SetActive(false);
             }
@@ -35,33 +36,32 @@ public class Slot : Regist
             }
         }
     }
+    public bool lock_;
+
     public bool Available
     {
-        get { return Available_; }
+        get { return available; }
         set
         {
             if (value)
             {
-                if (Flower == null)
+                if (PlantFlower == null)
                 {
-                    Available_ = value;
+                    available = value;
                 }
             }
             else
             {
-                Available_ = value;
+                available = value;
             }
         }
     }
-
-    public bool Lock_;
-    public bool Available_;
+    public bool available;
 
     public int Index;
-
-    public Flower Flower;
-    public TextMesh TextMesh;
-    public FlowerInfo FlowerInfo;
+    public Flower PlantFlower;
+    public TextMesh StatusTextMesh;
+    public FlowerInfo PlantFlowerInfo;
     public GameObject Icon;
     public BoxCollider2D Collider;
 
@@ -78,9 +78,9 @@ public class Slot : Regist
 
         Icon = transform.GetChild(0).gameObject;
 	    Collider = GetComponent<BoxCollider2D>();
-        TextMesh = transform.GetChild(0).GetChild(0).GetComponent<TextMesh>();
+        StatusTextMesh = transform.GetChild(0).GetChild(0).GetComponent<TextMesh>();
 
-        LanguageManager.Add(TextMesh, new MulLanStr(LanguageLabel.Object__SlotSign));
+        LanguageManager.Add(StatusTextMesh, new MulLanStr(LanguageLabel.Object__SlotSign));
 
         return false;
     }
@@ -88,37 +88,38 @@ public class Slot : Regist
 
     public void Plant(FlowerInfo flowerInfo, bool anim)
     {
-        FlowerInfo = flowerInfo;
+        PlantFlowerInfo = flowerInfo;
 
         Collider.enabled = false;
 
         Available = false;
 
-        FlowerInfo.PlantAmt++;
+        PlantFlowerInfo.PlantAmt++;
 
-        Flower = ResourceManager.GetFlower(flowerInfo, this, true);
+        PlantFlower = ResourceManager.GetFlower(flowerInfo, this, true);
 
         if (anim)
         {
-            Flower.PlayFlashLight();
+            PlantFlower.PlayFlashLight();
         }
         
-        GardenManager.PlantList.Add(this);
+        GardenManager.PlantSlotList.Add(this);
     }
 
+
     public void Retrieve()
     {
         Collider.enabled = true;
 
-        Available_ = true;
+        available = true;
 
-        FlowerInfo.PlantAmt--;
+        PlantFlowerInfo.PlantAmt--;
 
-        GardenManager.PlantList.Remove(this);
+        GardenManager.PlantSlotList.Remove(this);
 
 
-        Flower.Retrieve();
+        PlantFlower.RetrieveFlower();
 
-        Flower = null;
+        PlantFlower = null;
     }
 }

Assets/Script/Object/Star.cs

@@ -64,13 +64,16 @@ public class Star : MonoBehaviour, IPointerClickHandler
     public BoxCollider2D BoxCollider_;
     public SpriteRenderer SpriteRenderer_;
 
+    public static float Time;
     public float Timer;
-    public float SpeedY = 6f;
-    public float FreezeY;
 
+    public float MinSpeed = 1.5f;
+    public float MaxSpeed = 3f;
+    public float YSpeed = 6f;
 
-    public static float CD;
-    public static float Time;
+    public float YFreezePosition;
+
+    public static float MinigameCD;
 
     #endregion
 
@@ -85,7 +88,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
             SpriteRenderer.TweenBacSr();
         }
 
-        if (transform.position.y <= FreezeY - 0.1f)
+        if (transform.position.y <= YFreezePosition - 0.1f)
         {
             Rigidbody.velocity = new Vector2();
 
@@ -94,9 +97,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
 	}
 
 
-    private float MinSpeed = 1.5f;
-    private float MaxSpeed = 3f;
-    public void Initialize(float freezY, bool forceLeft, bool forceRight)
+    public void Init(float freezY, bool forceLeft, bool forceRight)
     {
         AudioManager.PlayClip(AudioLabel.Bubble);
 
@@ -120,7 +121,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
         }
 
 
-        Rigidbody.velocity = new Vector2(speedX, SpeedY);
+        Rigidbody.velocity = new Vector2(speedX, YSpeed);
 
         Rigidbody.isKinematic = false;
 
@@ -129,7 +130,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
 
         Timer = 0;
 
-        FreezeY = freezY;
+        YFreezePosition = freezY;
 
         SpriteRenderer.GetTweenSr().InDestination = true;
 
@@ -152,7 +153,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
         BoxCollider.enabled = false;
 
 
-        InfoBoxManager.GardenInfoBox.Show(Language.GetStr(LanguageLabel.Object__Star) + CD.ToString("0") + Auxiliary.GetUnit((int)CD, Unit.Second), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+        InfoBoxManager.GardenInfoBox.Display(Language.GetStr(LanguageLabel.Object__Star) + MinigameCD.ToString("0") + Auxiliary.GetUnit((int)MinigameCD, Unit.Second), 10f, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
 
 
         Move2D move2D = new Move2D(transform);
@@ -171,7 +172,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
             () =>
             {
                 SpriteRenderer.TweenBacSr();
-                Manager.MiniTimer -= CD;
+                Manager.MinigameCDTimer -= MinigameCD;
             }
         );
     }

Assets/Script/Object/Tutorial.cs

@@ -27,7 +27,7 @@ public class Tutorial : Regist, IPointerClickHandler
 {
     #region Config
 
-    public static bool MaskLock;
+    public static bool MaskFlag;
     public static Material Material;
     public static Transform Arrow;
 
@@ -59,7 +59,7 @@ public class Tutorial : Regist, IPointerClickHandler
         canvas.overrideSorting = true;
         canvas.sortingOrder = order;
 
-        MaskLock = true;
+        MaskFlag = true;
 
         PointScreen(arrowPos.position, target);
 
@@ -79,7 +79,7 @@ public class Tutorial : Regist, IPointerClickHandler
         canvas.sortingOrder = 1;
 
 
-        MaskLock = true;
+        MaskFlag = true;
 
         PointScreen(arrowPos.position, targetPos);
 
@@ -108,7 +108,7 @@ public class Tutorial : Regist, IPointerClickHandler
 
         ClearArea();
 
-        MaskLock = false;
+        MaskFlag = false;
     }
 
     public static void HightDisable(int index, bool hideArrow)
@@ -134,7 +134,7 @@ public class Tutorial : Regist, IPointerClickHandler
 
         screenPos = new Vector3(screenPos.x / Screen.width, screenPos.y / Screen.height, 0);
 
-        if (MaskLock)
+        if (MaskFlag)
         {
             Material.SetFloat("_RadiusX", radiusX);
             Material.SetFloat("_RadiusY", radiusY);
@@ -148,7 +148,7 @@ public class Tutorial : Regist, IPointerClickHandler
 
     public static void ClearArea()
     {
-        if (MaskLock)
+        if (MaskFlag)
         {
             Material.SetFloat("_RadiusX", 0);
             Material.SetFloat("_RadiusY", 0);
@@ -231,11 +231,11 @@ public class Tutorial : Regist, IPointerClickHandler
             ResourceManager.Get(TutorialLabel.PlayerBk2).TweenBacScale();
             ResourceManager.Get(TutorialLabel.PlayerBk3).TweenBacScale();
 
-            PlayerManager.PlayerPink.TweenBacScale();
-            PlayerManager.PlayerBlond.TweenBacScale();
-            PlayerManager.PlayerBrown.TweenForScale();
+            PlayerManager.DefaultPinkPlayer.TweenBacScale();
+            PlayerManager.DefaultBlondPlayer.TweenBacScale();
+            PlayerManager.DefaultBrownPlayer.TweenForScale();
 
-            PlayerManager.SeleTra = PlayerManager.PlayerBrown;
+            PlayerManager.SelectedPlayer = PlayerManager.DefaultBrownPlayer;
         }
         else if (eventData.rawPointerPress.name == TutorialLabel.PlayerBk2)
         {
@@ -251,11 +251,11 @@ public class Tutorial : Regist, IPointerClickHandler
             ResourceManager.Get(TutorialLabel.PlayerBk1).TweenBacScale();
             ResourceManager.Get(TutorialLabel.PlayerBk3).TweenBacScale();
 
-            PlayerManager.PlayerPink.TweenBacScale();
-            PlayerManager.PlayerBlond.TweenForScale();
-            PlayerManager.PlayerBrown.TweenBacScale();
+            PlayerManager.DefaultPinkPlayer.TweenBacScale();
+            PlayerManager.DefaultBlondPlayer.TweenForScale();
+            PlayerManager.DefaultBrownPlayer.TweenBacScale();
 
-            PlayerManager.SeleTra = PlayerManager.PlayerBlond;
+            PlayerManager.SelectedPlayer = PlayerManager.DefaultBlondPlayer;
         }
         else if (eventData.rawPointerPress.name == TutorialLabel.PlayerBk3)
         {
@@ -271,11 +271,11 @@ public class Tutorial : Regist, IPointerClickHandler
             ResourceManager.Get(TutorialLabel.PlayerBk1).TweenBacScale();
             ResourceManager.Get(TutorialLabel.PlayerBk2).TweenBacScale();
 
-            PlayerManager.PlayerPink.TweenForScale();
-            PlayerManager.PlayerBlond.TweenBacScale();
-            PlayerManager.PlayerBrown.TweenBacScale();
+            PlayerManager.DefaultPinkPlayer.TweenForScale();
+            PlayerManager.DefaultBlondPlayer.TweenBacScale();
+            PlayerManager.DefaultBrownPlayer.TweenBacScale();
 
-            PlayerManager.SeleTra = PlayerManager.PlayerPink;
+            PlayerManager.SelectedPlayer = PlayerManager.DefaultPinkPlayer;
         }
         else if (eventData.rawPointerPress.name == TutorialLabel.TutorialCollider)
         {

Assets/Script/SFS/Manager/ChestManager.cs

@@ -132,13 +132,13 @@ public class ChestManager : Regist
 
     public static int PlayerMaxGuessAmt = 3;
 
-    private static Text Desc;
-    private static Text BtnLab;
-    private static Text SliderValueLab;
-    private static Slider Slider;
-    private static Button Btn;
-    private static Button GuessBtn;
-    private static InputField InputField;
+    private static Text Create_DescriptionText;
+    private static Text Create_ButtonText;
+    private static Text Create_SliderValueText;
+    private static Slider Create_RoundSlider;
+    private static Button Create_Button;
+    private static InputField Create_InputField;
+    private static Button GuessButton;
     private static InputField GuessInputField;
 
     public static List<PlazaRoomChest> PlazaRoomChests = new List<PlazaRoomChest>();
@@ -167,14 +167,14 @@ public class ChestManager : Regist
 
     public override void RegistReference()
     {
-        Btn = ResourceManager.Get<Button>(ObjectLabel.Yb_Btn);
-        GuessBtn = ResourceManager.Get<Button>(ObjectLabel.Y_Btn);
-        Desc = ResourceManager.Get<Text>(ObjectLabel.Yb_Desc);
-        Slider = ResourceManager.Get<Slider>(ObjectLabel.Yb_Slider);
-        BtnLab = ResourceManager.Get<Text>(ObjectLabel.Yb_BtnLab);
-        InputField = ResourceManager.Get<InputField>(ObjectLabel.Yb_InputField);
+        Create_Button = ResourceManager.Get<Button>(ObjectLabel.Yb_Btn);
+        GuessButton = ResourceManager.Get<Button>(ObjectLabel.Y_Btn);
+        Create_DescriptionText = ResourceManager.Get<Text>(ObjectLabel.Yb_Desc);
+        Create_RoundSlider = ResourceManager.Get<Slider>(ObjectLabel.Yb_Slider);
+        Create_ButtonText = ResourceManager.Get<Text>(ObjectLabel.Yb_BtnLab);
+        Create_InputField = ResourceManager.Get<InputField>(ObjectLabel.Yb_InputField);
         GuessInputField = ResourceManager.Get<InputField>(ObjectLabel.Y_InputField);
-        SliderValueLab = ResourceManager.Get<Text>(ObjectLabel.Yb_SliderValueLab);
+        Create_SliderValueText = ResourceManager.Get<Text>(ObjectLabel.Yb_SliderValueLab);
 
         GuessInputField.onValueChanged.AddListener(OnGuessInputValueChange);
         OnGuessInputValueChange(null);
@@ -185,13 +185,13 @@ public class ChestManager : Regist
     {
         if (string.IsNullOrEmpty(value))
         {
-            GuessBtn.image.material = Lib.GrayMat;
-            GuessBtn.interactable = false;
+            GuessButton.image.material = Lib.GrayMat;
+            GuessButton.interactable = false;
         }
         else
         {
-            GuessBtn.image.material = null;
-            GuessBtn.interactable = true;
+            GuessButton.image.material = null;
+            GuessButton.interactable = true;
         }
     }
 
@@ -202,10 +202,10 @@ public class ChestManager : Regist
         ResourceManager.SetActive(ObjectLabel.Ya_GetAward, false);
         ResourceManager.SetActive(ObjectLabel.Y_Guess, false);
         ResourceManager.SetActive(ObjectLabel.Yb_CreateChest, true);
-        OnSliderValueChange(Slider.value);
-        OnInputValueChange(InputField.text);
-        Slider.value = 1;
-        Slider.maxValue = SFSManager.GardenSmartFox.PlazaRoomController.CurrentRoomData.MaxPlayer;
+        OnSliderValueChange(Create_RoundSlider.value);
+        OnInputValueChange(Create_InputField.text);
+        Create_RoundSlider.value = 1;
+        Create_RoundSlider.maxValue = SFSManager.GardenSmartFox.PlazaRoomController.CurrentRoomData.MaxPlayer;
     }
 
     public static void CloseCreateChestPanel()
@@ -218,7 +218,7 @@ public class ChestManager : Regist
         if (enable)
         {
             ChestType = ChestType.Lucky;
-            LanguageManager.Add(Desc, new MulLanStr(LanguageLabel.UI__Yb_LuckyDesc));
+            LanguageManager.Add(Create_DescriptionText, new MulLanStr(LanguageLabel.UI__Yb_LuckyDesc));
         }
     }
 
@@ -227,7 +227,7 @@ public class ChestManager : Regist
         if (enable)
         {
             ChestType = ChestType.GuessColor;
-            LanguageManager.Add(Desc, new MulLanStr(LanguageLabel.UI__Yb_GuessColorDesc));
+            LanguageManager.Add(Create_DescriptionText, new MulLanStr(LanguageLabel.UI__Yb_GuessColorDesc));
         }
     }
 
@@ -236,7 +236,7 @@ public class ChestManager : Regist
         if (enable)
         {
             ChestType = ChestType.GuessNumber;
-            LanguageManager.Add(Desc, new MulLanStr(LanguageLabel.UI__Yb_GuessNumberDesc));
+            LanguageManager.Add(Create_DescriptionText, new MulLanStr(LanguageLabel.UI__Yb_GuessNumberDesc));
         }
     }
 
@@ -244,9 +244,9 @@ public class ChestManager : Regist
     {
         if (string.IsNullOrEmpty(value) || int.Parse(value) < 20)
         {
-            Btn.interactable = false;
-            Btn.image.material = Lib.GrayMat;
-            LanguageManager.Add(BtnLab, new MulLanStr(LanguageLabel.UI__Yb_Minimum));
+            Create_Button.interactable = false;
+            Create_Button.image.material = Lib.GrayMat;
+            LanguageManager.Add(Create_ButtonText, new MulLanStr(LanguageLabel.UI__Yb_Minimum));
             return;
         }
 
@@ -254,22 +254,22 @@ public class ChestManager : Regist
         ResourceManager.SetText(ObjectLabel.Yb_CostLab, Language.GetStr(LanguageLabel.UI__AA_Cost) + TransferLabel.DiamondSprite + Cost);
         if (Manager.Diamond < Cost)
         {
-            Btn.interactable = false;
-            Btn.image.material = Lib.GrayMat;
-            LanguageManager.Add(BtnLab, new MulLanStr(LanguageLabel.Common__ShortDiamond));
+            Create_Button.interactable = false;
+            Create_Button.image.material = Lib.GrayMat;
+            LanguageManager.Add(Create_ButtonText, new MulLanStr(LanguageLabel.Common__ShortDiamond));
         }
         else
         {
-            Btn.interactable = true;
-            Btn.image.material = null;
-            LanguageManager.Add(BtnLab, new MulLanStr(LanguageLabel.Common__Confirm));
+            Create_Button.interactable = true;
+            Create_Button.image.material = null;
+            LanguageManager.Add(Create_ButtonText, new MulLanStr(LanguageLabel.Common__Confirm));
         }
     }
 
     public static void OnSliderValueChange(float value)
     {
         Round = (int) value;
-        SliderValueLab.text = Round + Language.GetStr(LanguageLabel.UI__Yb_SliderValueLab);
+        Create_SliderValueText.text = Round + Language.GetStr(LanguageLabel.UI__Yb_SliderValueLab);
     }
 
 
@@ -500,7 +500,7 @@ public class ChestManager : Regist
 
         PlazaRoomChest.SystemChest.Deactive();
         PlazaRoomChest.SystemChest.TurnGray();
-        PlazaRoomChest.SystemChest.ChestTimer = PlazaRoomChest.SystemChest.ChestTime - pasttime + 1;
+        PlazaRoomChest.SystemChest.ChestRefreshTimer = PlazaRoomChest.SystemChest.ChestRefreshTime - pasttime + 1;
     }
 
     public static void ReceiveChestAward(int award, long chestID)
@@ -512,7 +512,7 @@ public class ChestManager : Regist
         }
         else
         {
-            chestOperateData = new ChestOperateData(true, PlazaRoomChest.CurrentChest.ChestData.ID, PlazaRoomChest.CurrentChest.ChestData.DatabaseRoomID);
+            chestOperateData = new ChestOperateData(true, PlazaRoomChest.SelectedChest.ChestData.ID, PlazaRoomChest.SelectedChest.ChestData.DatabaseRoomID);
             OperateDataDictionary.Add(chestOperateData.ChestID, chestOperateData);
         }
 
@@ -545,7 +545,7 @@ public class ChestManager : Regist
             {
                 if (PlazaRoomChests[i].ChestData.ChestType == ChestType.System)
                 {
-                    PlazaRoomChests[i].ResetChestTimer();
+                    PlazaRoomChests[i].ResetChestRefreshTimer();
                     OperateDataDictionary[chestID].RemainGuessAmt = 0;
                     OperateDataDictionary[chestID].LastActivatedTime = PlazaRoomChests[i].LastActivatedTime;
                 }
@@ -568,7 +568,7 @@ public class ChestManager : Regist
         if (refund > 0)
         {
             Manager.AddDiamond(refund, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.RoomChestRefund);
-            InfoBoxManager.GardenInfoBox.Show(Language.GetStr(LanguageLabel.UI__Y_Refund)+refund, 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
+            InfoBoxManager.GardenInfoBox.Display(Language.GetStr(LanguageLabel.UI__Y_Refund)+refund, 10, Color.white, ResourceManager.LoadSprite("Atlas", Folder.Atlas));
         }
     }
 

Assets/Script/SFS/Manager/PlazaRoomController.cs

@@ -193,7 +193,7 @@ public class PlazaRoomController
         ResourceManager.Get(ObjectLabel.B_SignIn0).TweenBacCG();
         ResourceManager.Get(ObjectLabel.T_NickName).TweenBacCG();
 
-        Manager.SceneSwitchLock = true;
+        Manager.SceneSwitchFlag = true;
 
         TweenRoot tweenRoot = ResourceManager.Get(ObjectLabel.V_BlackMask).TweenBacCG();
 
@@ -277,7 +277,7 @@ public class PlazaRoomController
         AudioManager.PartyThemeAudio.TweenForAudio();
 
         InPlazaRoom = true;
-        PlazaRoomManager.ClosePanel();
+        PlazaRoomManager.CloseJoinRoomPanel();
 
         GardenManager.RetrieveAllElf();
         IAPManager.RetrieveADChest();
@@ -355,7 +355,7 @@ public class PlazaRoomController
             EventType.ForwardFinish,
             () =>
             {
-                PlazaRoomManager.OpenPanel();
+                PlazaRoomManager.OpenJoinRoomPanel();
             }
         );
     }
@@ -364,7 +364,7 @@ public class PlazaRoomController
     {
         PlazaRoomChest.SystemChest = null;
 
-        Manager.SceneSwitchLock = false;
+        Manager.SceneSwitchFlag = false;
 
         GardenSmartFox.SmartFox.Send(new LeaveRoomRequest(CurrentPlazaRoom));
 
@@ -566,7 +566,7 @@ public class PlazaRoomController
 
         foreach (var closeID in closeIDs)
         {
-            CloseItem closeItem = PlayerManager.CloseItemDic[closeID];
+            CloseItem closeItem = PlayerManager.CloseItemDictionary[closeID];
 
             player.ChangeClose(closeItem.BodyPart, closeItem.ArmatureName);
         }
@@ -588,7 +588,7 @@ public class PlazaRoomController
         string senderName = senderID == SFSManager.GardenSmartFox.User.Id ? Language.GetStr(LanguageLabel.UI__X_Self) : plazaRoomPlayer.NickName;
         string message = $"{senderName}:\u3000<({expressionName}按钮)>";
         Color textColor = senderID == SFSManager.GardenSmartFox.User.Id ? Lib.SelfMessage : Lib.OtherMessage;
-        InfoBoxManager.PlazaRoomInfoBox.Show(message, Mathf.Infinity, textColor, ResourceManager.LoadSprite(ResourceLabel.Expression, Folder.Scene));
+        InfoBoxManager.PlazaRoomInfoBox.Display(message, Mathf.Infinity, textColor, ResourceManager.LoadSprite(ResourceLabel.Expression, Folder.Scene));
         Text text = ResourceManager.Get<Text>(ObjectLabel.X_CurrentInfoLab);
         text.color = textColor;
         text.text = message;
@@ -604,7 +604,7 @@ public class PlazaRoomController
         string senderName = senderID == SFSManager.GardenSmartFox.User.Id ? Language.GetStr(LanguageLabel.UI__X_Self) : plazaRoomPlayer.NickName;
 
         message = $"{senderName}:\u3000{message}";
-        InfoBoxManager.PlazaRoomInfoBox.Show(message, Mathf.Infinity, textColor, ResourceManager.LoadSprite(ResourceLabel.Expression, Folder.Scene));
+        InfoBoxManager.PlazaRoomInfoBox.Display(message, Mathf.Infinity, textColor, ResourceManager.LoadSprite(ResourceLabel.Expression, Folder.Scene));
 
         ResourceManager.SetText(ObjectLabel.X_CurrentInfoLab, message);
         Text text = ResourceManager.Get<Text>(ObjectLabel.X_CurrentInfoLab);
@@ -677,7 +677,7 @@ public class PlazaRoomController
 
         foreach (var id in dressDataIDs)
         {
-            CloseItem closeItem = PlayerManager.CloseItemDic[id];
+            CloseItem closeItem = PlayerManager.CloseItemDictionary[id];
 
             closeItem.ChangeDress(player);
         }

Assets/Script/SFS/Manager/RobotManager.cs

@@ -14,7 +14,7 @@ public class RobotManager : Regist
 
     public static void AddRobot(int currentRobotAmt, long robotConfigID, bool randomPos, string nickname, List<string> dressdatas)
     {
-        Robot.Initialize();
+        Robot.Init();
         int sfsRoomID = SFSManager.GardenSmartFox.PlazaRoomController.CurrentPlazaRoom.Id;
         int maxPlayer = SFSManager.GardenSmartFox.PlazaRoomController.CurrentRoomData.MaxPlayer;
         int maxRobot = (int) Auxiliary.FmlParse(Robot.MaxRobotAmtFml, "p", maxPlayer.ToString());

Assets/Script/SFS/Object/Robot.cs

@@ -21,7 +21,7 @@ public class Robot
     private static Vector2 RightTop;
     private static Camera Camera;
 
-    private static bool Initialized;
+    private static bool Inited;
     private static int MinChestValue;
     private static int MaxChestValue;
     private static float MinLifetime;
@@ -45,11 +45,11 @@ public class Robot
 
     #endregion
 
-    public static void Initialize()
+    public static void Init()
     {
-        if (Initialized)
+        if (Inited)
         {
-            Initialized = true;
+            Inited = true;
             return;
         }
 

Assets/Script/SFS/SFSEvent/PlazaRoomEvent.cs

@@ -392,7 +392,7 @@ public class PlazaRoomEvent
         //    Debug.LogWarning(array.GetSFSObject(i).GetDump());
         //}
 
-        PlazaRoomManager.OnReceiveRoomData(array);
+        PlazaRoomManager.OnReceiveNormalRoomData(array);
     }
 
     public void OnReceiveCustomRoomData(BaseEvent baseEvent)

Assets/Script/ThirdParty/Alipay/AlipayManager.cs

@@ -28,7 +28,7 @@ public class AliplayManager : UnitySingleton<AliplayManager>
 
 #endif
 
-        IAPManager.Complete = true;
+        IAPManager.Inited = true;
 	}
 
 	public void Pay(string id, string packName){
@@ -81,7 +81,7 @@ public class AliplayManager : UnitySingleton<AliplayManager>
             {
                 PackNameDic.Remove(key);
 
-                IAPManager.ProductActionDic[packName].Invoke();
+                IAPManager.BuyProductCallbackDictionary[packName].Invoke();
             }
         }
         else

Assets/Script/Tool/Auxiliary.cs

@@ -178,7 +178,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            Manager.MiniTimer = 0;
+            Manager.MinigameCDTimer = 0;
             TutorialManager.MemoryMinigameTutorial = true;
         }
 
@@ -361,9 +361,9 @@ public class Auxiliary : Regist
 
     private static void ResetAllCd()
     {
-        for (int i = 0; i < Manager.CoolList.Count; i++)
+        for (int i = 0; i < Manager.CoolSkillList.Count; i++)
         {
-            Manager.CoolList[i].CoolTimer = 0;
+            Manager.CoolSkillList[i].CoolTimer = 0;
         }
     }
 

Assets/Script/Tool/Bundle.cs

@@ -204,7 +204,7 @@ public class Bundle : MonoBehaviour
         {
             for (int i = 0; i < Instance.Atlas2List.Count; i++)
             {
-                ResourceManager.ObjDic.UniqueAdd(Instance.Atlas2List[i].name, Instance.Atlas2List[i]);
+                ResourceManager.ObjectDictionary.UniqueAdd(Instance.Atlas2List[i].name, Instance.Atlas2List[i]);
             }
 
 #if UNITY_EDITOR
@@ -219,8 +219,8 @@ public class Bundle : MonoBehaviour
 
                 if (sprite != null)
                 {
-                    PlayerManager.CloseSpriteDic.Add(sprite.name, sprite);
-                    ResourceManager.ObjDic.UniqueAdd(sprite.name, sprite);
+                    PlayerManager.CloseSpriteDictionary.Add(sprite.name, sprite);
+                    ResourceManager.ObjectDictionary.UniqueAdd(sprite.name, sprite);
                 }
             }
 
@@ -234,21 +234,21 @@ public class Bundle : MonoBehaviour
 
             for (int i = 0; i < sprites.Length; i++)
             {
-                ResourceManager.ObjDic.UniqueAdd(sprites[i].name, sprites[i]);
+                ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
             }
 
             sprites = Atlas.LoadAllAssets<Sprite>();
 
             for (int i = 0; i < sprites.Length; i++)
             {
-                ResourceManager.ObjDic.UniqueAdd(sprites[i].name, sprites[i]);
+                ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
             }
 
             sprites = Scene.LoadAssetWithSubAssets<Sprite>("FlowerItemAtlas1");
 
             for (int i = 0; i < sprites.Length; i++)
             {
-                ResourceManager.ObjDic.UniqueAdd(sprites[i].name, sprites[i]);
+                ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
             }
 
             Object[] objects = Scene.LoadAssetWithSubAssets("stand_texture", typeof(Sprite));
@@ -257,8 +257,8 @@ public class Bundle : MonoBehaviour
             {
                 Sprite sprite = (Sprite)objects[i];
 
-                PlayerManager.CloseSpriteDic.Add(sprite.name, sprite);
-                ResourceManager.SpriteDic.UniqueAdd(sprite.name, sprite);
+                PlayerManager.CloseSpriteDictionary.Add(sprite.name, sprite);
+                ResourceManager.SpriteDictionary.UniqueAdd(sprite.name, sprite);
             }
 
             #endregion
@@ -348,12 +348,12 @@ public class Bundle : MonoBehaviour
 
         if (!Logo.Complete && !Initializer.Instance.DebugMode)
         {
-            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config, () => { ConfigManager.ConfigDocument = ConfigManager.ConfigDocument; HttpManager.PackTypeRequest(); });
+            ResourceManager.AddAsyncLoad<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config, () => { ConfigManager.ConfigDocument = ConfigManager.ConfigDocument; HttpManager.GetBuyPackLimitFlag(); });
         }
         else
         {
             ConfigManager.ConfigDocument = ConfigManager.ConfigDocument;
-            HttpManager.PackTypeRequest();
+            HttpManager.GetBuyPackLimitFlag();
         }
 
         //yield return LoadDiscard();
@@ -385,7 +385,7 @@ public class Bundle : MonoBehaviour
         {
             ResourceManager.AddAsyncLoad(ResourceLabel.Flower, 9, Folder.Scene, ObjType.Flower);
 
-            ResourceManager.AddAsyncLoad(ResourceLabel.Page, 2, Folder.Scene, ObjType.Page);
+            ResourceManager.AddAsyncLoad(ResourceLabel.Page, 2, Folder.Scene, ObjType.SlotPage);
             ResourceManager.AddAsyncLoad(ResourceLabel.Garden, 1, Folder.Scene, ObjType.Garden);
             ResourceManager.AddAsyncLoad(ResourceLabel.DressRoom, 1, Folder.Scene, ObjType.DressRoom);
         }

Assets/Script/Tool/DashGame/Logo.cs

@@ -29,12 +29,12 @@ public class Logo : MonoBehaviour
 
     public void Finish()
     {
-        ResourceManager.Instance.StopAsync();
+        ResourceManager.Instance.StopAllAsync();
 
 
         Camera.SetActive(false);
 
-        UIManager.InitialInstantiate();
+        UIManager.Init();
 
         SceneManager.LoadScene(1);
 

Assets/Script/Tool/LabelUtility/LabelUtility.cs

@@ -25,6 +25,7 @@ public class LabelUtility : MonoBehaviour
 
     #endregion
 
+    #if UNITY_EDITOR
     public void ClearLabels()
     {
         if (EditorUtility.DisplayDialog("注意", "清空所有标签?", "确定", "取消"))
@@ -143,6 +144,7 @@ public class LabelUtility : MonoBehaviour
             throw new Exception("没有找到标记");
         }
     }
+    #endif
 
     public static string CombineLanguageLabel(string page, string id)
     {

Assets/Script/Tool/UI/SpriteAsset.cs

@@ -72,7 +72,7 @@ public class SpriteAsset : MonoBehaviour
     {
         for (int i = 0; i < sprites.Length; i++)
         {
-            ResourceManager.ObjDic.UniqueAdd(sprites[i].name, sprites[i]);
+            ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
 
             SpriteInfo spriteInfo = new SpriteInfo();
             spriteInfo.Name = sprites[i].name;