修改bug

Assets/ChillConnect/FGUI/package/AddCell_12/AddCell_12Binder.cs

@@ -9,8 +9,6 @@ namespace FGUI.AddCell_12
         public static void BindAll()
         {
             UIObjectFactory.SetPackageItemExtension(com_addView.URL, typeof(com_addView));
-            UIObjectFactory.SetPackageItemExtension(btn_common_green.URL, typeof(btn_common_green));
-            UIObjectFactory.SetPackageItemExtension(btn_add_watchAd.URL, typeof(btn_add_watchAd));
             UIObjectFactory.SetPackageItemExtension(com_addView_off.URL, typeof(com_addView_off));
         }
     }

Assets/ChillConnect/FGUI/package/AddCell_12/btn_add_watchAd.cs

@@ -1,37 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-using FairyGUI.Utils;
-
-namespace FGUI.AddCell_12
-{
-    public partial class btn_add_watchAd : GButton
-    {
-        public Controller buy_state;
-        public Controller can_buy;
-        public GTextField btn_text;
-        public GTextField watch;
-        public GImage ad_icon;
-        public GImage img_saveingpot;
-        public GTextField text_time;
-        public const string URL = "ui://cwrkvs46iec4ax";
-
-        public static btn_add_watchAd CreateInstance()
-        {
-            return (btn_add_watchAd)UIPackage.CreateObject("AddCell_12", "btn_add_watchAd");
-        }
-
-        public override void ConstructFromXML(XML xml)
-        {
-            base.ConstructFromXML(xml);
-
-            buy_state = GetControllerAt(0);
-            can_buy = GetControllerAt(1);
-            btn_text = (GTextField)GetChildAt(2);
-            watch = (GTextField)GetChildAt(3);
-            ad_icon = (GImage)GetChildAt(4);
-            img_saveingpot = (GImage)GetChildAt(6);
-            text_time = (GTextField)GetChildAt(11);
-        }
-    }
-}

Assets/ChillConnect/FGUI/package/AddCell_12/btn_add_watchAd.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f8fa3b82e7aa96d4983e455b7b245e78
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/ChillConnect/FGUI/package/AddCell_12/btn_common_green.cs

@@ -1,25 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-using FairyGUI.Utils;
-
-namespace FGUI.AddCell_12
-{
-    public partial class btn_common_green : GButton
-    {
-        public GImage img_saveingpot;
-        public const string URL = "ui://cwrkvs46iec414";
-
-        public static btn_common_green CreateInstance()
-        {
-            return (btn_common_green)UIPackage.CreateObject("AddCell_12", "btn_common_green");
-        }
-
-        public override void ConstructFromXML(XML xml)
-        {
-            base.ConstructFromXML(xml);
-
-            img_saveingpot = (GImage)GetChildAt(2);
-        }
-    }
-}

Assets/ChillConnect/FGUI/package/AddCell_12/btn_common_green.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 749f2089d80100543b71f9339cb2864f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/ChillConnect/FGUI/package/Common_01/Common_01Binder.cs

@@ -38,9 +38,7 @@ namespace FGUI.Common_01
             UIObjectFactory.SetPackageItemExtension(btn_claim.URL, typeof(btn_claim));
             UIObjectFactory.SetPackageItemExtension(btn_boxreward.URL, typeof(btn_boxreward));
             UIObjectFactory.SetPackageItemExtension(btn_threeday.URL, typeof(btn_threeday));
-            UIObjectFactory.SetPackageItemExtension(btn_card.URL, typeof(btn_card));
             UIObjectFactory.SetPackageItemExtension(btn_failpack.URL, typeof(btn_failpack));
-            UIObjectFactory.SetPackageItemExtension(btn_luck_gift.URL, typeof(btn_luck_gift));
         }
     }
 }

Assets/ChillConnect/FGUI/package/Common_01/btn_card.cs

@@ -1,25 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-using FairyGUI.Utils;
-
-namespace FGUI.Common_01
-{
-    public partial class btn_card : GButton
-    {
-        public GImage red;
-        public const string URL = "ui://o9974uc5y1du2p";
-
-        public static btn_card CreateInstance()
-        {
-            return (btn_card)UIPackage.CreateObject("Common_01", "btn_card");
-        }
-
-        public override void ConstructFromXML(XML xml)
-        {
-            base.ConstructFromXML(xml);
-
-            red = (GImage)GetChildAt(1);
-        }
-    }
-}

Assets/ChillConnect/FGUI/package/Common_01/btn_card.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ed435e8ec2063824091d54f273294805
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/ChillConnect/FGUI/package/Common_01/btn_luck_gift.cs

@@ -1,25 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-using FairyGUI.Utils;
-
-namespace FGUI.Common_01
-{
-    public partial class btn_luck_gift : GButton
-    {
-        public GImage red;
-        public const string URL = "ui://o9974uc5ybesal";
-
-        public static btn_luck_gift CreateInstance()
-        {
-            return (btn_luck_gift)UIPackage.CreateObject("Common_01", "btn_luck_gift");
-        }
-
-        public override void ConstructFromXML(XML xml)
-        {
-            base.ConstructFromXML(xml);
-
-            red = (GImage)GetChildAt(1);
-        }
-    }
-}

Assets/ChillConnect/FGUI/package/Common_01/btn_luck_gift.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 94070281f5339814380cdb8e5444fd53
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/ChillConnect/FGUI/package/Game_04/Game_04Binder.cs

@@ -15,7 +15,6 @@ namespace FGUI.Game_04
             UIObjectFactory.SetPackageItemExtension(btn_prop.URL, typeof(btn_prop));
             UIObjectFactory.SetPackageItemExtension(com_open.URL, typeof(com_open));
             UIObjectFactory.SetPackageItemExtension(com_game.URL, typeof(com_game));
-            UIObjectFactory.SetPackageItemExtension(com_state.URL, typeof(com_state));
             UIObjectFactory.SetPackageItemExtension(btn_add.URL, typeof(btn_add));
             UIObjectFactory.SetPackageItemExtension(btn_exit.URL, typeof(btn_exit));
         }

Assets/ChillConnect/FGUI/package/Game_04/com_state.cs

@@ -1,25 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-using FairyGUI.Utils;
-
-namespace FGUI.Game_04
-{
-    public partial class com_state : GComponent
-    {
-        public GRichTextField text_level;
-        public const string URL = "ui://g3iqdlgcopwgy";
-
-        public static com_state CreateInstance()
-        {
-            return (com_state)UIPackage.CreateObject("Game_04", "com_state");
-        }
-
-        public override void ConstructFromXML(XML xml)
-        {
-            base.ConstructFromXML(xml);
-
-            text_level = (GRichTextField)GetChildAt(0);
-        }
-    }
-}

Assets/ChillConnect/FGUI/package/Game_04/com_state.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: edb47f4eda6f26b46898bc18d7ee1871
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/ChillConnect/Manager/FXManager.cs

@@ -169,7 +169,6 @@
         fx_broad,
         fx_login_light,
         fx_login_bird,
-        fx_btn_play,
         fx_coin,
         fx_hand_pre,
         fx_disaappear_1,

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 60a73fbf896bc394f8bbb2988235c7e6
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/fx_btn_play.prefab

@@ -1,123 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &8199273842531755948
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8108074089940185204}
-  - component: {fileID: 2016207299710351759}
-  - component: {fileID: 667631953045773237}
-  - component: {fileID: 1929929366198807263}
-  m_Layer: 0
-  m_Name: fx_btn_play
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8108074089940185204
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8199273842531755948}
-  serializedVersion: 2
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &2016207299710351759
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8199273842531755948}
-  m_Mesh: {fileID: 0}
---- !u!23 &667631953045773237
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8199273842531755948}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 847eab9b06f25aa4a842ed28b514f607, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!114 &1929929366198807263
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8199273842531755948}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  skeletonDataAsset: {fileID: 11400000, guid: 4eb7d0a599f61a64092e5511b688a831, type: 2}
-  initialSkinName: 
-  initialFlipX: 0
-  initialFlipY: 0
-  updateWhenInvisible: 3
-  separatorSlotNames: []
-  zSpacing: 0
-  useClipping: 1
-  immutableTriangles: 0
-  pmaVertexColors: 1
-  clearStateOnDisable: 0
-  tintBlack: 0
-  singleSubmesh: 0
-  fixDrawOrder: 0
-  addNormals: 0
-  calculateTangents: 0
-  maskInteraction: 0
-  maskMaterials:
-    materialsMaskDisabled: []
-    materialsInsideMask: []
-    materialsOutsideMask: []
-  disableRenderingOnOverride: 1
-  _animationName: 
-  loop: 0
-  timeScale: 1

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/fx_btn_play.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 43f30a48650bb2d4fb2be15af9f2552f
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/play.atlas.txt

@@ -1,55 +0,0 @@
-
-play.png
-size: 438,243
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bai
-  rotate: false
-  xy: 2, 2
-  size: 301, 21
-  orig: 303, 23
-  offset: 1, 1
-  index: -1
-guang
-  rotate: false
-  xy: 2, 25
-  size: 306, 92
-  orig: 308, 94
-  offset: 1, 1
-  index: -1
-play
-  rotate: false
-  xy: 2, 119
-  size: 324, 122
-  orig: 326, 124
-  offset: 1, 1
-  index: -1
-star1
-  rotate: true
-  xy: 328, 87
-  size: 69, 70
-  orig: 71, 72
-  offset: 1, 1
-  index: -1
-star2
-  rotate: true
-  xy: 379, 29
-  size: 56, 57
-  orig: 58, 59
-  offset: 1, 1
-  index: -1
-star3
-  rotate: true
-  xy: 328, 158
-  size: 83, 85
-  orig: 85, 87
-  offset: 1, 1
-  index: -1
-star4
-  rotate: false
-  xy: 310, 16
-  size: 67, 69
-  orig: 69, 71
-  offset: 1, 1
-  index: -1

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/play.atlas.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 46f8e6133105b434eb606c4e55e6b4fd
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/play.json

@@ -1 +0,0 @@
-{"skeleton":{"hash":"fSAJP0Ra7y0LgNiEK1AT258tN1g","spine":"3.8.93","x":-210,"y":-114,"width":422,"height":227,"images":"./images/","audio":"D:/冰箱/动效/主界面_play"},"bones":[{"name":"root"},{"name":"guang","parent":"root"},{"name":"bone","parent":"root","x":175.93,"y":-78.22},{"name":"bone2","parent":"root","x":130.9,"y":77.96},{"name":"bone3","parent":"root","x":-166.64,"y":55.16},{"name":"star2","parent":"root"},{"name":"bai","parent":"root"}],"slots":[{"name":"play","bone":"root","attachment":"play"},{"name":"guang","bone":"guang","attachment":"guang"},{"name":"bai","bone":"bai","attachment":"bai"},{"name":"star4","bone":"bone2","attachment":"star4"},{"name":"star3","bone":"bone3","attachment":"star3"},{"name":"star2","bone":"star2","attachment":"star2"},{"name":"star1","bone":"bone","attachment":"star1"}],"skins":[{"name":"default","attachments":{"bai":{"bai":{"x":2.5,"y":40.5,"width":303,"height":23}},"guang":{"guang":{"x":5,"y":5,"width":308,"height":94}},"play":{"play":{"x":5,"y":-3,"width":326,"height":124}},"star1":{"star1":{"x":0.57,"y":0.22,"width":71,"height":72}},"star2":{"star2":{"x":51,"y":52.5,"width":58,"height":59}},"star3":{"star3":{"x":-0.86,"y":1.34,"width":85,"height":87}},"star4":{"star4":{"x":-0.4,"y":-0.46,"width":69,"height":71}}}}],"animations":{"animation":{"slots":{"bai":{"color":[{"color":"ffffffff","curve":0.25,"c3":0.75},{"time":1.6667,"color":"ffffffd8","curve":0.25,"c3":0.75},{"time":3.3333,"color":"ffffffff"}]},"guang":{"color":[{"color":"ffffffff","curve":0.25,"c3":0.75},{"time":1.6667,"color":"ffffff33","curve":0.25,"c3":0.75},{"time":3.3333,"color":"ffffffff"}]},"star1":{"color":[{"color":"ffffff45","curve":0.25,"c3":0.75},{"time":0.3333,"color":"ffffffff","curve":"stepped"},{"time":1.3333,"color":"ffffffff","curve":0.25,"c3":0.75},{"time":2,"color":"ffffff57","curve":0.25,"c3":0.75},{"time":2.9,"color":"ffffffff","curve":0.25,"c3":0.75},{"time":3.3333,"color":"ffffff45"}]},"star2":{"color":[{"color":"ffffff00","curve":0.25,"c3":0.75},{"time":0.6667,"color":"ffffffff","curve":"stepped"},{"time":2.3333,"color":"ffffffff","curve":0.25,"c3":0.75},{"time":3.3333,"color":"ffffff00"}]},"star3":{"color":[{"color":"ffffffff","curve":0.25,"c3":0.75},{"time":0.6667,"color":"ffffff70","curve":0.25,"c3":0.75},{"time":1.3333,"color":"ffffff1f","curve":0.25,"c3":0.75},{"time":2,"color":"ffffffff","curve":0.25,"c3":0.75},{"time":2.6667,"color":"ffffff50","curve":0.25,"c3":0.75},{"time":3.3333,"color":"ffffffff"}]},"star4":{"color":[{"color":"ffffffff","curve":0.25,"c3":0.75},{"time":0.8333,"color":"ffffff33","curve":0.25,"c3":0.75},{"time":1.6667,"color":"ffffffff","curve":0.25,"c3":0.75},{"time":2.5,"color":"ffffff55","curve":0.25,"c3":0.75},{"time":3.3333,"color":"ffffffff"}]}}}}}

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/play.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c9c52698656ef4a40a58b80664cbd901
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/play.png.meta

@@ -1,153 +0,0 @@
-fileFormatVersion: 2
-guid: bc7521aebd9bb0b468712d9d488b229f
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/play_Atlas.asset

@@ -1,17 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
-  m_Name: play_Atlas
-  m_EditorClassIdentifier: 
-  atlasFile: {fileID: 4900000, guid: 46f8e6133105b434eb606c4e55e6b4fd, type: 3}
-  materials:
-  - {fileID: 2100000, guid: 847eab9b06f25aa4a842ed28b514f607, type: 2}

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/play_Atlas.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e65c476b0ed53104190f1d83faadc580
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/play_Material.mat

@@ -1,47 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: play_Material
-  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _STRAIGHT_ALPHA_INPUT
-  m_InvalidKeywords:
-  - CLIPPED
-  - _USE8NEIGHBOURHOOD_ON
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: bc7521aebd9bb0b468712d9d488b229f, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _Cutoff: 0.1
-    - _OutlineMipLevel: 0
-    - _OutlineReferenceTexWidth: 1024
-    - _OutlineSmoothness: 1
-    - _OutlineWidth: 3
-    - _StencilComp: 8
-    - _StencilRef: 0
-    - _StraightAlphaInput: 1
-    - _ThresholdEnd: 0.25
-    - _Use8Neighbourhood: 1
-    m_Colors:
-    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
-  m_BuildTextureStacks: []

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/play_Material.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 847eab9b06f25aa4a842ed28b514f607
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/play_SkeletonData.asset

@@ -1,31 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
-  m_Name: play_SkeletonData
-  m_EditorClassIdentifier: 
-  atlasAssets:
-  - {fileID: 11400000, guid: e65c476b0ed53104190f1d83faadc580, type: 2}
-  scale: 0.01
-  skeletonJSON: {fileID: 4900000, guid: c9c52698656ef4a40a58b80664cbd901, type: 3}
-  isUpgradingBlendModeMaterials: 0
-  blendModeMaterials:
-    requiresBlendModeMaterials: 0
-    applyAdditiveMaterial: 0
-    additiveMaterials: []
-    multiplyMaterials: []
-    screenMaterials: []
-  skeletonDataModifiers: []
-  fromAnimation: []
-  toAnimation: []
-  duration: []
-  defaultMix: 0.2
-  controller: {fileID: 0}

Assets/Resources/ChillConnectAssets/Effect/spine/fx_btn_play/play_SkeletonData.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4eb7d0a599f61a64092e5511b688a831
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/ChillConnectAssets/Effect/spine/fx_win/congratulations_yanhua_Material.mat

@@ -37,7 +37,7 @@ Material:
     - _OutlineSmoothness: 1
     - _OutlineWidth: 3
     - _StencilComp: 8
-    - _StencilRef: 1
+    - _StencilRef: 0
     - _StraightAlphaInput: 1
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1

Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star_Material.mat

@@ -11,7 +11,8 @@ Material:
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 4
@@ -36,8 +37,8 @@ Material:
     - _OutlineSmoothness: 1
     - _OutlineWidth: 3
     - _StencilComp: 8
-    - _StencilRef: 1
+    - _StencilRef: 0
-    - _StraightAlphaInput: 0
+    - _StraightAlphaInput: 1
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
     m_Colors:

Assets/Scenes/MainScene.unity

@@ -341,63 +341,63 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 132536, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 66.532364
       objectReference: {fileID: 0}
     - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 36
       objectReference: {fileID: 0}
     - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 275.39563
       objectReference: {fileID: 0}
     - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 66.532364
       objectReference: {fileID: 0}
     - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 36
       objectReference: {fileID: 0}
     - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 341.92798
       objectReference: {fileID: 0}
     - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_Pivot.x
@@ -481,123 +481,123 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 66.532364
       objectReference: {fileID: 0}
     - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 36
       objectReference: {fileID: 0}
     - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 474.99268
       objectReference: {fileID: 0}
     - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 66.532364
       objectReference: {fileID: 0}
     - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 36
       objectReference: {fileID: 0}
     - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 99.798546
       objectReference: {fileID: 0}
     - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 66.532364
       objectReference: {fileID: 0}
     - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 36
       objectReference: {fileID: 0}
     - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 408.46033
       objectReference: {fileID: 0}
     - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 109.064735
       objectReference: {fileID: 0}
     - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 36
       objectReference: {fileID: 0}
     - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 187.59709
       objectReference: {fileID: 0}
     - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 66.532364
       objectReference: {fileID: 0}
     - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 36
       objectReference: {fileID: 0}
     - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 33.266182
       objectReference: {fileID: 0}
     - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     - target: {fileID: 958269219681220773, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_fontAsset

Assets/Scripts/ModuleManager/ModuleManagerRegister.cs

@@ -30,7 +30,6 @@ namespace ChillConnect
             moduleManager.AddModel(ModelConst.WheelViewModel, new WheelViewModel());
             moduleManager.AddModel(ModelConst.BuygoldModel, new BuygoldModel());
             moduleManager.AddModel(ModelConst.GameMenuModel, new GameMenuModel());
-            moduleManager.AddModel(ModelConst.EggViewModel, new EggViewModel());
             moduleManager.AddModel(ModelConst.PersonViewModel, new PersonViewModel());
             moduleManager.AddModel(ModelConst.TipsViewModel, new TipsViewModel());
             moduleManager.AddModel(ModelConst.LevelRewardModel, new LevelRewardModel());
@@ -82,7 +81,6 @@ namespace ChillConnect
             moduleManager.AddUICtrl(UICtrlConst.WheelViewUICtrl, new WheelViewUICtrl());
             moduleManager.AddUICtrl(UICtrlConst.BuygoldUICtrl, new BuygoldUICtrl());
             moduleManager.AddUICtrl(UICtrlConst.GameMenuUICtrl, new GameMenuUICtrl());
-            moduleManager.AddUICtrl(UICtrlConst.EggViewUICtrl, new EggViewUICtrl());
             moduleManager.AddUICtrl(UICtrlConst.PersonViewUICtrl, new PersonViewUICtrl());
             moduleManager.AddUICtrl(UICtrlConst.TipsViewUICtrl, new TipsViewUICtrl());
             moduleManager.AddUICtrl(UICtrlConst.LevelRewardUICtrl, new LevelRewardUICtrl());
@@ -136,7 +134,6 @@ namespace ChillConnect
             moduleManager.AddCtrl(CtrlConst.WheelViewCtrl, new WheelViewCtrl());
             moduleManager.AddCtrl(CtrlConst.BuygoldCtrl, new BuygoldCtrl());
             moduleManager.AddCtrl(CtrlConst.GameMenuCtrl, new GameMenuCtrl());
-            moduleManager.AddCtrl(CtrlConst.EggViewCtrl, new EggViewCtrl());
             moduleManager.AddCtrl(CtrlConst.PersonViewCtrl, new PersonViewCtrl());
             moduleManager.AddCtrl(CtrlConst.TipsViewCtrl, new TipsViewCtrl());
             moduleManager.AddCtrl(CtrlConst.LevelRewardCtrl, new LevelRewardCtrl());
@@ -190,7 +187,6 @@ namespace ChillConnect
             moduleManager.AddUIType(UIConst.WheelViewUI, typeof(WheelViewUI));
             moduleManager.AddUIType(UIConst.BuygoldUI, typeof(BuygoldUI));
             moduleManager.AddUIType(UIConst.GameMenuUI, typeof(GameMenuUI));
-            moduleManager.AddUIType(UIConst.EggViewUI, typeof(EggViewUI));
             moduleManager.AddUIType(UIConst.PersonViewUI, typeof(PersonViewUI));
             moduleManager.AddUIType(UIConst.TipsViewUI, typeof(TipsViewUI));
             moduleManager.AddUIType(UIConst.LevelRewardUI, typeof(LevelRewardUI));

Assets/Scripts/ModuleUI/EggView.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3fffb6fe8cbf8b443b36f49dcf29c2e8
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/ModuleUI/EggView/EggViewCtrl.cs

@@ -1,41 +0,0 @@
-namespace ChillConnect
-{
-    public class EggViewCtrl : BaseCtrl
-    {
-        public static EggViewCtrl Instance { get; private set; }
-
-        private EggViewModel model;
-
-        #region 生命周期
-        protected override void OnInit()
-        {
-            Instance = this;
-        }
-
-        protected override void OnDispose()
-        {
-            Instance = null;
-        }
-        #endregion
-
-        #region 消息
-        protected override void AddListener()
-        {
-
-        }
-        protected override void RemoveListener()
-        {
-
-        }
-
-        protected override void AddServerListener()
-        {
-
-        }
-        protected override void RemoveServerListener()
-        {
-
-        }
-        #endregion
-    }
-}

Assets/Scripts/ModuleUI/EggView/EggViewCtrl.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 067af4881df6cf24da19c0bdc72b1c5d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/ModuleUI/EggView/EggViewModel.cs

@@ -1,26 +0,0 @@
-namespace ChillConnect
-{
-    public class EggViewModel : BaseModel
-    {
-        #region 生命周期
-        protected override void OnInit()
-        {
-        }
-
-        protected override void OnDispose()
-        {
-        }
-        #endregion 
-
-        #region 消息
-        protected override void AddListener()
-        {
-
-        }
-        protected override void RemoveListener()
-        {
-
-        }
-        #endregion
-    }
-}

Assets/Scripts/ModuleUI/EggView/EggViewModel.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c5e97df5815dcae438de3904dace8576
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/ModuleUI/EggView/EggViewUI.cs

@@ -1,228 +0,0 @@
-// using FGUI.A000_common;
-
-using System;
-using System.Collections.Generic;
-using DG.Tweening;
-using FairyGUI;
-using FGUI.Egg_20;
-using IgnoreOPS;
-using Spine.Unity;
-using UnityEngine;
-using Random = UnityEngine.Random;
-
-namespace ChillConnect
-{
-    public class EggViewUI : BaseUI
-    {
-        private EggViewUICtrl ctrl;
-
-        private com_egg ui;
-
-        private Action closeCallback;
-        private bool isShowAnim;
-
-        public EggViewUI(EggViewUICtrl ctrl) : base(ctrl)
-        {
-            uiName = UIConst.EggViewUI;
-            this.ctrl = ctrl;
-        }
-
-        protected override void SetUIInfo(UIInfo uiInfo)
-        {
-            uiInfo.packageName = "Egg_20";
-            uiInfo.assetName = "com_egg";
-            uiInfo.layerType = UILayerType.Popup;
-            uiInfo.isNeedOpenAnim = false;
-            uiInfo.isNeedCloseAnim = false;
-            uiInfo.isNeedUIMask = true;
-
-        }
-
-        #region 生命周期
-        protected override void OnInit()
-        {
-        }
-
-        protected override void OnClose()
-        {
-
-        }
-
-        protected override void OnBind()
-        {
-            ui = baseUI as com_egg;
-
-        }
-
-        private List<com_egg_item> eggList = new List<com_egg_item>();
-
-        protected override void OnOpenBefore(object args)
-        {
-
-            if (Screen.safeArea.y != 0)
-            {
-                ui.com_gold.y += 68;
-            }
-
-
-            eggList.Add(ui.egg_item0);
-            eggList.Add(ui.egg_item1);
-            eggList.Add(ui.egg_item2);
-            eggList.Add(ui.egg_item3);
-
-            InitView();
-        }
-
-
-        protected override void OnOpen(object args)
-        {
-        }
-
-        protected override void OnHide()
-        {
-        }
-
-        protected override void OnDisplay(object args)
-        {
-        }
-        #endregion
-
-        #region 消息
-        protected override void AddListener()
-        {
-
-        }
-        protected override void RemoveListener()
-        {
-
-        }
-        #endregion
-
-
-        //初始化页面逻辑
-        private void InitView()
-        {
-            ui.com_gold.GetChild("text_gold").text = GameHelper.Get101Str(GameHelper.GetGoldNumber());
-
-            int start = GameHelper.GetCommonModel().eggReward[0];
-            int end = GameHelper.GetCommonModel().eggReward[1];
-            int randomNumber = Random.Range(start, end + 1);
-
-            ui.btn_close.SetClick(() =>
-            {
-                if (isShowAnim)
-                {
-                    GetReward(randomNumber);
-                }
-                else
-                {
-                    CtrlCloseUI();
-                }
-            });
-            ui.btn_claim.SetClick(() =>
-            {
-                if (isShowAnim)
-                {
-                    GetReward(randomNumber);
-                }
-            });
-            ui.btn_claim_mult.SetClick(() =>
-            {
-                if (isShowAnim)
-                {
-                    GameHelper.ShowVideoAd("reward_egg", isSuccess =>
-                      {
-                          if (isSuccess)
-                          {
-                              GetReward(randomNumber * 2);
-                          }
-                      });
-                }
-            });
-
-            for (int i = 0; i < eggList.Count; i++)
-            {
-                int index = i;
-                eggList[index].egg_state.selectedIndex = 0;
-                eggList[index].SetClick(() =>
-                {
-                    eggList[index].egg.visible = false;
-                    setEggClickStatus(false);
-                    if (AudioManager.Instance.IsOpenEffect)
-                    {
-                        AudioManager.Instance.PlayDynamicEffect(AudioConst.egg);
-                    }
-
-                    eggList[index].text_num.text = "x" + GameHelper.Get101Str(randomNumber);
-                    var ani_node = eggList[index].GetChild("anim_bg") as GGraph;
-                    var sk = FXManager.Instance.SetFx<SkeletonAnimation>(ani_node, Fx_Type.fx_egg_light, ref closeCallback);
-                    sk.state.SetAnimation(0, "animation", false);
-                    sk.state.Complete += a =>
-                    {
-                        isShowAnim = true;
-                        var sk1 = FXManager.Instance.SetFx<SkeletonAnimation>(eggList[index].GetChild("anim_bg1") as GGraph, Fx_Type.fx_egg, ref closeCallback);
-                        sk1.state.SetAnimation(0, "animation", true);
-                        eggList[index].egg_state.selectedIndex = 1;
-
-                        setCliamStatus(true);
-                    };
-                });
-            }
-        }
-
-        void setCliamStatus(bool show)
-        {
-            ui.btn_claim_mult.visible = show;
-
-            DOVirtual.DelayedCall(1f, () =>
-            {
-                ui.btn_claim.visible = show;
-            });
-        }
-
-        void setEggClickStatus(bool isClick)
-        {
-            foreach (var item in eggList)
-            {
-                item.touchable = isClick;
-            }
-        }
-
-        private void GetReward(int awardNum)
-        {
-            isShowAnim = false;
-            var rewardData = new RewardData();
-            var start_pos = GameHelper.GetUICenterPosition(ui.btn_claim_mult);
-            var end = GameHelper.GetUICenterPosition(ui.com_gold.GetChild("icon"));
-
-            var rewardSingleData = new RewardSingleData(101, awardNum, RewardOrigin.AdTask)
-            {
-                startPosition = start_pos,
-                endPosition = new Vector2(end.x - 150, end.y - 136)
-            };
-
-            rewardData.AddReward(rewardSingleData);
-            rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange;
-            rewardData.AddCompleted(success =>
-            {
-                if (success)
-                {
-                    var startNum = DataMgr.Coin.Value - awardNum;
-
-                    DOVirtual.Float(startNum, GameHelper.GetGoldNumber(), 1f,
-                        value => { ui.com_gold.GetChild("text_gold").text = GameHelper.Get101Str((decimal)value); });
-
-                    DOVirtual.DelayedCall(1.2f, () =>
-                    {
-                        CtrlCloseUI();
-                    });
-
-                    SaveData.GetSaveObject().crush_egg_time = (int)GameHelper.GetNowTime() + GameHelper.GetCommonModel().eggCD;
-                    SaveData.saveDataFunc();
-                }
-
-            });
-            GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData);
-        }
-    }
-}

Assets/Scripts/ModuleUI/EggView/EggViewUI.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 521040850d295c84780f72d314d1fea2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/ModuleUI/EggView/EggViewUICtrl.cs

@@ -1,79 +0,0 @@
-
-namespace ChillConnect
-{
-    public class EggViewUICtrl : BaseUICtrl
-    {
-        private readonly uint closeUIMsg = UICtrlMsg.EggUI_Close;
-        private EggViewModel model;
-
-        private readonly uint openUIMsg = UICtrlMsg.EggUI_Open;
-        private EggViewUI ui;
-
-
-        #region 生命周期
-
-        protected override void OnInit()
-        {
-        }
-
-        protected override void OnDispose()
-        {
-        }
-
-        public override void OpenUI(object args = null)
-        {
-            if (ui == null)
-            {
-                ui = new EggViewUI(this);
-                ui.Open(args);
-            }
-
-        }
-
-        public override void CloseUI(object args = null)
-        {
-            if (ui != null && !ui.isClose)
-            {
-                ui.Close();
-            }
-
-            ui = null;
-        }
-
-        #endregion
-
-        #region 消息
-
-        public override uint GetOpenUIMsg(string uiName)
-        {
-            return openUIMsg;
-        }
-
-        public override uint GetCloseUIMsg(string uiName)
-        {
-            return closeUIMsg;
-        }
-
-        protected override void AddListener()
-        {
-            uiCtrlDispatcher.AddListener(openUIMsg, OpenUI);
-            uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI);
-        }
-
-        protected override void RemoveListener()
-        {
-            uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI);
-            uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI);
-        }
-
-        protected override void AddServerListener()
-        {
-        }
-
-        protected override void RemoveServerListener()
-        {
-        }
-
-        #endregion
-    }
-}

Assets/Scripts/ModuleUI/EggView/EggViewUICtrl.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 548b6b5219329cc4f88e684c3ab7a168
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/ModuleUI/Hall/HallUI.cs

@@ -81,7 +81,7 @@ namespace ChillConnect
         {
             if (Screen.safeArea.y != 0)
             {
-                //   ui.top_group.y += 68;
+                   ui.top_group.y += 68;
                 ui.left_group.y += 68;
                 ui.right_group.y += 68;
             }

Assets/Scripts/ModuleUI/Reward/RewardUI.cs

@@ -95,7 +95,7 @@ namespace ChillConnect
 
             var value = GetRewardValue();
             ui.text_num.text = GameHelper.Get101Str(value);
-            ui.btn_collect.title = "Claim(<img src='ui://o9974uc5cou6b8'/>" + GameHelper.Get101Str((decimal)value) + ")";
+            ui.btn_collect.title = "Claim(<img src='ui://o9974uc5k1oncy'/>" + GameHelper.Get101Str((decimal)value) + ")";
             DOVirtual.DelayedCall(0.2f, () =>
             {
                 var gamwin =

Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs

@@ -4,6 +4,7 @@ using DG.Tweening;
 using FairyGUI;
 using FGUI.store_17;
 using IgnoreOPS;
+using Newtonsoft.Json;
 using SGModule.Net;
 using SGModule.NetKit;
 using Spine.Unity;
@@ -102,9 +103,8 @@ namespace ChillConnect
 
 
             PaidgiftList = ConfigSystem.GetConfig<PaidgiftModel>().DataList;
-
             // NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.gold_show, 1);
-            TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.GoldShow);
+            TrackKit.SendEvent(GameHelper.getTrackEvenName(), Property.GoldShow);
 
             ui.top_gold.GetChild("text_gold").text = GameHelper.Get101Str(GameHelper.GetGoldNumber());
             //  ui.shop_panel_parent.shopPanel.pay_type.selectedIndex = !GameHelper.IsAdModelOfPay() ? 1 : 0;
@@ -246,7 +246,7 @@ namespace ChillConnect
             {
 
                 // NetworkKit.BuriedPoint(BuriedPointEvent.Apple_AD_event, BuriedPointEvent.gold_click_ad,1);
-                TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.GoldClickAd);
+                TrackKit.SendEvent(GameHelper.getTrackEvenName(), Property.GoldClickAd);
 
                 GameHelper.ShowVideoAd("BuyGold", issuccess =>
                 {
@@ -337,12 +337,12 @@ namespace ChillConnect
                         if (myAds >= needAds)
                         {
                             item.btn_buy.can_buy.selectedIndex = 0;
-                            item.btn_buy.btn_text.text = "Redeem";
+                            item.btn_buy.btn_text.text = needAds + "ADs";
                         }
                         else
                         {
                             item.btn_buy.can_buy.selectedIndex = 1;
-                            item.btn_buy.btn_text.text = myAds + "/" + needAds;
+                            item.btn_buy.btn_text.text =  needAds + "ADs";
                         }
 
                         item.text_ads.SetVar("ads", needAds.ToString()).FlushVars();