Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev

Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs

@@ -131,7 +131,7 @@ namespace BFEditor.Build
 			// 应用名
 			if (buildInfo.IsPublish())
 			{
-				PlayerSettings.productName = "b6";
+				PlayerSettings.productName = "Knight Connect";
 			}
 			else
 			{

Assets/Plugins/Android/AndroidManifest.xml

@@ -25,11 +25,11 @@
     <activity android:name="com.facebook.unity.FBUnityGameRequestActivity" />
     <activity android:name="com.facebook.unity.FBUnityCreateGameGroupActivity" />
     <activity android:name="com.facebook.unity.FBUnityJoinGameGroupActivity" />
-    <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="fb201089202542977" />
+    <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="fb222326627097275" />
-    <meta-data android:name="com.facebook.sdk.ClientToken" android:value="11811b9447848f6700c871aa7d739dc7" />
+    <meta-data android:name="com.facebook.sdk.ClientToken" android:value="7ec364275c7766833d2ebace0c5a806e" />
     <meta-data android:name="com.facebook.sdk.AutoLogAppEventsEnabled" android:value="true" />
     <meta-data android:name="com.facebook.sdk.AdvertiserIDCollectionEnabled" android:value="true" />
-    <provider android:name="com.facebook.FacebookContentProvider" android:authorities="com.facebook.app.FacebookContentProvider201089202542977" android:exported="true" />
+    <provider android:name="com.facebook.FacebookContentProvider" android:authorities="com.facebook.app.FacebookContentProvider222326627097275" android:exported="true" />
     <!-- <uses-permission android:name="com.google.android.gms.permission.AD_ID" /> -->
     <receiver android:name="com.adjust.sdk.AdjustReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES" android:exported="true">
       <intent-filter>

Assets/Scripts/Common/SDK/BFIronSourceSDKManager.cs

@@ -20,7 +20,7 @@ namespace BF
 
 	#if UNITY_ANDROID
 			// string appKey = "85460dcd";
-			string appKey = "193cca4fd";
+			string appKey = "19b1b4f1d";
 
 			BFLog.Log("unity-script: IronSource.Agent.validateIntegration");
 			IronSource.Agent.validateIntegration();
@@ -32,9 +32,9 @@ namespace BF
 			IronSource.Agent.init(appKey);
 			IronSource.Agent.setManualLoadRewardedVideo(true);
 	#elif UNITY_IPHONE
-			string appKey = "8545d445";
+			// string appKey = "8545d445";
 	#else
-			string appKey = "unexpected_platform";
+			// string appKey = "unexpected_platform";
 	#endif
 			// BFLog.Log("unity-script: IronSource.Agent.validateIntegration");
 			// IronSource.Agent.validateIntegration();

Assets/Scripts/Common/SDK/BFLoginSDKManager.cs

@@ -43,7 +43,7 @@ namespace BF
         public Action<bool, string> luaServerListCallback;
         public Action<bool, string> luaAccountLoginCallback;
         public Action<bool, string> luaAccountChangeCallback;
-        // public FacebookSdk FBSdk = new FacebookSdk();
+        public FacebookSdk FBSdk = new FacebookSdk();
         public BFAccountInfo accountInfo; // 账号信息
         public string firebaseToken = string.Empty;
         public Action<string> luaFirebaseTokenCallback;
@@ -66,8 +66,8 @@ namespace BF
         {
             // facebook
             BFLog.Log("FBSdk.Init");
-            // FBSdk.Init();
+            FBSdk.Init();
-            // FBSdk.SetULoginListener(this);
+            FBSdk.SetULoginListener(this);
 
             // appid 登陆
 #if UNITY_IOS
@@ -77,7 +77,7 @@ namespace BF
 
         void OnApplicationPause(bool pauseStatus)
         {
-            // FBSdk.OnApplicationPause(pauseStatus);
+            FBSdk.OnApplicationPause(pauseStatus);
         }
 
         void Start()
@@ -149,7 +149,7 @@ namespace BF
             BFLog.Log("新版 登陆中心 Login:" + type);
             if (type == LoginType.Facebook)
             {
-                // FBSdk.Login();
+                FBSdk.Login();
             }
             else if(type == LoginType.Google)
             {
@@ -173,7 +173,7 @@ namespace BF
         {
             if (type == LoginType.Facebook)
             {
-                // FBSdk.Logout();
+                FBSdk.Logout();
             }
             else if(type == LoginType.Google)
             {

Assets/Scripts/Common/SDK/BFThirdReportSDKManager.cs

@@ -19,114 +19,114 @@ namespace BF
         public void Init()
         {
             BFLog.Log("TASdk.Init");
-            // TASdk.Init();
+            TASdk.Init();
-            // AFSdk.Init();
+            AFSdk.Init();
         }
 
         // 设置账户id
         public void SetThinkingAnalyticsAccountId(string id)
         {
-            // TASdk.SetAccountId(id);
+            TASdk.SetAccountId(id);
         }
 
         // 清除账户id
         public void ClearThinkingAnalyticsAccountId()
         {
-            // TASdk.ClearAccountId();
+            TASdk.ClearAccountId();
         }
 
         // 数数科技上报
         // lua端使用
         public void PostThinkingAnalyticsEvent(string eventName, string data = "")
         {
-            // if (string.IsNullOrEmpty(data))
+            if (string.IsNullOrEmpty(data))
-            // {
+            {
-            //     TASdk.Track(eventName, null);
+                TASdk.Track(eventName, null);
-            // }
+            }
-            // else
+            else
-            // {
+            {
-            //     var properties = JsonConvert.DeserializeObject<Dictionary<string, object>>(data);
+                var properties = JsonConvert.DeserializeObject<Dictionary<string, object>>(data);
-            //     TASdk.Track(eventName, properties);
+                TASdk.Track(eventName, properties);
-            // }
+            }
         }
 
         // 数数科技上报
         // c#端使用，只上报事件名
         public void PostThinkingAnalyticsEventName(string eventName)
         {
-            // TASdk.Track(eventName, null);
+            TASdk.Track(eventName, null);
         }
 
         // 数数科技上报
         // c#端使用，上报事件名和参数
         public void PostThinkingAnalyticsEventProperties(string eventName, Dictionary<string, object> properties)
         {
-            // TASdk.Track(eventName, properties);
+            TASdk.Track(eventName, properties);
         }
 
         public void PostAppsflyerEvent(string eventName, string data = "")
         {
-            // if (string.IsNullOrEmpty(data))
+            if (string.IsNullOrEmpty(data))
-            // {
+            {
-            //     AFSdk.SendEvent(eventName, null);
+                AFSdk.SendEvent(eventName, null);
-            // }
+            }
-            // else
+            else
-            // {
+            {
-            //     var properties = JsonConvert.DeserializeObject<Dictionary<string, string>>(data);
+                var properties = JsonConvert.DeserializeObject<Dictionary<string, string>>(data);
-            //     AFSdk.SendEvent(eventName, properties);
+                AFSdk.SendEvent(eventName, properties);
-            // }
+            }
         }
 
         public void PostFireBaseEvent(string eventName, string data = "")
         {
-            // if (string.IsNullOrEmpty(data))
+            if (string.IsNullOrEmpty(data))
-            // {
+            {
-            //     return;
+                return;
-            // }
+            }
-            // else
+            else
-            // {
+            {
-            //     BFMain.Instance.SDKMgr.BFNativeSDKMgr.LogEvent(eventName, data);
+                BFMain.Instance.SDKMgr.BFNativeSDKMgr.LogEvent(eventName, data);
-            // }
+            }
         }
 
         // 设置账户id
         public void PostAdjustSimpleTrackEvent(string key)
         {
-            // AdjustEvent adjustEvent = new AdjustEvent(key);
+            AdjustEvent adjustEvent = new AdjustEvent(key);
-            // // BFLog.Log("PostAdjustSimpleTrackEvent");
+            // BFLog.Log("PostAdjustSimpleTrackEvent");
-            // Adjust.trackEvent(adjustEvent);
+            Adjust.trackEvent(adjustEvent);
         }
 
         public void PostAdjustRevenueTrackEvent(string key, double currency, string currencyCode)
         {
-            // AdjustEvent adjustEvent = new AdjustEvent(key);
+            AdjustEvent adjustEvent = new AdjustEvent(key);
-            // adjustEvent.setRevenue(currency, currencyCode);
+            adjustEvent.setRevenue(currency, currencyCode);
-            // // BFLog.Log("PostAdjustRevenueTrackEvent");
+            // BFLog.Log("PostAdjustRevenueTrackEvent");
-            // Adjust.trackEvent(adjustEvent);
+            Adjust.trackEvent(adjustEvent);
         }
 
         public void PostAdjustCallbackTrackEvent(string key, string data = "")
         {
-            // var properties = JsonConvert.DeserializeObject<Dictionary<string, string>>(data);
+            var properties = JsonConvert.DeserializeObject<Dictionary<string, string>>(data);
-            // AdjustEvent adjustEvent = new AdjustEvent(key);
+            AdjustEvent adjustEvent = new AdjustEvent(key);
-            // foreach (var item in properties)
+            foreach (var item in properties)
-            // {
+            {
-            //     adjustEvent.addCallbackParameter(item.Key, item.Value);
+                adjustEvent.addCallbackParameter(item.Key, item.Value);
-            // }
+            }
-            // // BFLog.Log("PostAdjustCallbackTrackEvent");
+            // BFLog.Log("PostAdjustCallbackTrackEvent");
-            // Adjust.trackEvent(adjustEvent);
+            Adjust.trackEvent(adjustEvent);
         }
 
         public void PostAdjustPartnerTrackEvent(string key, string data = "")
         {
-            // var properties = JsonConvert.DeserializeObject<Dictionary<string, string>>(data);
+            var properties = JsonConvert.DeserializeObject<Dictionary<string, string>>(data);
-            // AdjustEvent adjustEvent = new AdjustEvent(key);
+            AdjustEvent adjustEvent = new AdjustEvent(key);
-            // foreach (var item in properties)
+            foreach (var item in properties)
-            // {
+            {
-            //     adjustEvent.addPartnerParameter(item.Key, item.Value);
+                adjustEvent.addPartnerParameter(item.Key, item.Value);
-            // }
+            }
-            // // BFLog.Log("PostAdjustPartnerTrackEvent");
+            // BFLog.Log("PostAdjustPartnerTrackEvent");
-            // Adjust.trackEvent(adjustEvent);
+            Adjust.trackEvent(adjustEvent);
         }
     }
 }

Assets/Scripts/Common/SDK/SDKManager.cs

@@ -96,7 +96,7 @@ namespace BF
             BFPaySDKMgr = sdkGo.AddComponent<BFPaySDKManager>();
             // 广告
             // BFAdmobSDKMgr = sdkGo.AddComponent<BFAdmobSDKManager>();
-            // BFIronSourceSDKMgr = sdkGo.AddComponent<BFIronSourceSDKManager>();
+            BFIronSourceSDKMgr = sdkGo.AddComponent<BFIronSourceSDKManager>();
             // 三方上报
             BFThirdReportSDKMgr = sdkGo.AddComponent<BFThirdReportSDKManager>();
             // native交互管理

Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset

@@ -14,11 +14,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   selectedAppIndex: 0
   clientTokens:
-  - 
+  - 7ec364275c7766833d2ebace0c5a806e
   appIds:
-  - 
+  - 222326627097275
   appLabels:
-  - 
+  - Knight Connect
   cookie: 1
   logging: 1
   status: 1

Assets/arts/effects/material/battle/sfx_common_dun_b01/sfx_common_dun_b01_02.mat

@@ -0,0 +1,107 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: sfx_common_dun_b01_02
+  m_Shader: {fileID: 4800000, guid: eac4334090c65754681f95f415e55406, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _diss_tex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _tex:
+        m_Texture: {fileID: 2800000, guid: 147ba1b42f626334b8ffcbd83a213157, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _tex_mask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _CULLENUM: 0
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _HIDE_Y: 0
+    - _MASK_UV_SPEED_CUSTOM: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - _diss_alpha_clip: 0
+    - _diss_clip: 0.2
+    - _diss_edge_smoothness: 1.8
+    - _diss_edge_width: 0.01
+    - _diss_smoothness: 0.01
+    - _diss_tex_rotate: 0
+    - _tex_mask_rotate: 0
+    - _tex_rotate: 0
+    - _ztest_on: 4
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1}
+    - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0}
+    - _tex_color: {r: 1.216786, g: 1.216786, b: 1.216786, a: 1}
+    - _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0}
+    - _tex_uv_speed: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []

Assets/arts/effects/material/battle/sfx_common_dun_b01/sfx_common_dun_b01_02.mat.meta

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

Assets/arts/effects/material/battle/sfx_common_dun_b01/sfx_common_dun_b01_03.mat

@@ -0,0 +1,107 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: sfx_common_dun_b01_03
+  m_Shader: {fileID: 4800000, guid: eac4334090c65754681f95f415e55406, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _diss_tex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _tex:
+        m_Texture: {fileID: 2800000, guid: a8ae12d8bc545f84d81bf2c25ad68597, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _tex_mask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _CULLENUM: 0
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _HIDE_Y: 0
+    - _MASK_UV_SPEED_CUSTOM: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - _diss_alpha_clip: 0
+    - _diss_clip: 0.2
+    - _diss_edge_smoothness: 1.8
+    - _diss_edge_width: 0.01
+    - _diss_smoothness: 0.01
+    - _diss_tex_rotate: 0
+    - _tex_mask_rotate: 0
+    - _tex_rotate: 0
+    - _ztest_on: 4
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1}
+    - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0}
+    - _tex_color: {r: 1.216786, g: 1.216786, b: 1.216786, a: 1}
+    - _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0}
+    - _tex_uv_speed: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []

Assets/arts/effects/material/battle/sfx_common_dun_b01/sfx_common_dun_b01_03.mat.meta

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

Assets/arts/effects/material/battle/sfx_common_dun_b01/sfx_common_dun_b01_04.mat

@@ -0,0 +1,107 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: sfx_common_dun_b01_04
+  m_Shader: {fileID: 4800000, guid: eac4334090c65754681f95f415e55406, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _diss_tex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _tex:
+        m_Texture: {fileID: 2800000, guid: 64d2a674ca76412498b2ceda2985a7d3, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _tex_mask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _CULLENUM: 0
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _HIDE_Y: 0
+    - _MASK_UV_SPEED_CUSTOM: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - _diss_alpha_clip: 0
+    - _diss_clip: 0.2
+    - _diss_edge_smoothness: 1.8
+    - _diss_edge_width: 0.01
+    - _diss_smoothness: 0.01
+    - _diss_tex_rotate: 0
+    - _tex_mask_rotate: 0
+    - _tex_rotate: 0
+    - _ztest_on: 4
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _diss_edge_color: {r: 1, g: 1, b: 1, a: 1}
+    - _diss_tex_offset: {r: 0, g: 0, b: 0, a: 0}
+    - _tex_color: {r: 1.216786, g: 1.216786, b: 1.216786, a: 1}
+    - _tex_mask_uv_speed: {r: 0, g: 0, b: 0, a: 0}
+    - _tex_uv_speed: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []

Assets/arts/effects/material/battle/sfx_common_dun_b01/sfx_common_dun_b01_04.mat.meta

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

Assets/arts/effects/texture/other/spark_df_0016.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d6df0917341131a45b1ab9a98a4c6c66
+guid: 147ba1b42f626334b8ffcbd83a213157
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -35,24 +35,24 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 1
+    wrapU: 0
-    wrapV: 1
+    wrapV: 0
-    wrapW: 1
+    wrapW: 0
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 28, y: 28, z: 28, w: 28}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -103,12 +103,12 @@ TextureImporter:
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 12
+    textureFormat: -1
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -117,7 +117,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 5e97eb03825dee720800000000000000
+    spriteID: 
     internalID: 0
     vertices: []
     indices: 
@@ -128,5 +128,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: first/first.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/effects/texture/ring/fx_b_ring_006_b01.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d8bf1cffe7b0a6544a9d402d029e733d
+guid: 7270800578b648a43800b529d3e8d3b5
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -35,24 +35,24 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 1
+    wrapU: 0
-    wrapV: 1
+    wrapV: 0
-    wrapW: 1
+    wrapW: 0
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 19, y: 19, z: 19, w: 19}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -103,12 +103,12 @@ TextureImporter:
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 12
+    textureFormat: -1
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -117,7 +117,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 5e97eb03825dee720800000000000000
+    spriteID: 
     internalID: 0
     vertices: []
     indices: 
@@ -128,5 +128,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: first/first.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/first/ui/common_board_2.png.meta

@@ -37,7 +37,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 1
+    wrapW: 0
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -47,8 +47,8 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 17, y: 17, z: 17, w: 17}
+  spriteBorder: {x: 32, y: 32, z: 32, w: 32}
-  spriteGenerateFallbackPhysicsShape: 1
+  spriteGenerateFallbackPhysicsShape: 0
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
@@ -76,39 +76,39 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Android
+    buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 47
+    textureFormat: -1
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 50
+    textureFormat: -1
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Standalone
+    buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 12
+    textureFormat: -1
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -128,5 +128,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: first/first.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/first/ui/common_board_4.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c04546cc54e8bcc44824a06143313e33
+guid: a3fb767166419f04088ab41a4a5ff274
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -47,8 +47,8 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 21, y: 12, z: 21, w: 21}
+  spriteBorder: {x: 40, y: 40, z: 40, w: 40}
-  spriteGenerateFallbackPhysicsShape: 1
+  spriteGenerateFallbackPhysicsShape: 0
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
@@ -87,6 +87,18 @@ TextureImporter:
     overridden: 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
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
@@ -116,5 +128,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: first/first.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/first/ui/common_btn_green_2.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 4a72a8c80da9c824fb4f0b0adb8e2bea
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 26, y: 32, z: 26, w: 24}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 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
+    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
+    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
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/first/ui/common_btn_red_2.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: aa63070905d352f43aee9ca65e14bfb2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 26, y: 32, z: 26, w: 24}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 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
+    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
+    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
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/first/ui/common_title_4.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e1e91d9c85a27304bb2f35bdb6d78d1d
+guid: 8343adc73d2a0ae4f8e50d61d4bcad27
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -37,7 +37,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 1
+    wrapW: 0
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -47,7 +47,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 28, y: 28, z: 28, w: 28}
+  spriteBorder: {x: 32, y: 0, z: 32, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -76,39 +76,39 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Android
+    buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 47
+    textureFormat: -1
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 50
+    textureFormat: -1
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Standalone
+    buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 12
+    textureFormat: -1
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -128,5 +128,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: first/first.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/first/ui/first.prefab

@@ -125,12 +125,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 9148346167279928157}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 23}
-  m_SizeDelta: {x: 594, y: 76}
+  m_SizeDelta: {x: 638, y: 100}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1813936604392136997
 CanvasRenderer:
@@ -160,7 +160,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c04546cc54e8bcc44824a06143313e33, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8343adc73d2a0ae4f8e50d61d4bcad27, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -278,7 +278,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -141, y: -161}
+  m_AnchoredPosition: {x: -124, y: -95}
   m_SizeDelta: {x: 208, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7470947447568709749
@@ -309,7 +309,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d6df0917341131a45b1ab9a98a4c6c66, type: 3}
+  m_Sprite: {fileID: 21300000, guid: aa63070905d352f43aee9ca65e14bfb2, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -528,8 +528,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 4572803369166070718}
   - {fileID: 8746548397368214977}
+  - {fileID: 4572803369166070718}
   - {fileID: 7055499158932467233}
   - {fileID: 7220032382195896184}
   - {fileID: 2654996993487592751}
@@ -539,7 +539,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 594, y: 466}
+  m_SizeDelta: {x: 576, y: 426}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &950151610585111869
 CanvasRenderer:
@@ -569,7 +569,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d8bf1cffe7b0a6544a9d402d029e733d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a3fb767166419f04088ab41a4a5ff274, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -615,7 +615,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 141, y: -161}
+  m_AnchoredPosition: {x: 124, y: -95}
   m_SizeDelta: {x: 208, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &255261530843180814
@@ -646,7 +646,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e1e91d9c85a27304bb2f35bdb6d78d1d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4a72a8c80da9c824fb4f0b0adb8e2bea, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -854,12 +854,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 9148346167279928157}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 44}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 560, y: 168}
+  m_SizeDelta: {x: 552, y: 402}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6385298505705733844
 CanvasRenderer:

Assets/prefabs/effects/battle/sfx_common_dun_b02.prefab.meta

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

Assets/prefabs/ui/common/message_box.prefab

@@ -143,8 +143,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7062665755871776357}
-  - component: {fileID: 7969685718366547740}
-  - component: {fileID: 8739795655230302781}
   m_Layer: 5
   m_Name: bg
   m_TagString: Untagged
@@ -172,44 +170,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 128}
   m_SizeDelta: {x: 550, y: 174}
   m_Pivot: {x: 0.5, y: 1}
---- !u!222 &7969685718366547740
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1352431187774359455}
-  m_CullTransparentMesh: 1
---- !u!114 &8739795655230302781
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1352431187774359455}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 0d8971bf74f69c44cbb36a78a7dbfa32, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3068702869260340252
 GameObject:
   m_ObjectHideFlags: 0
@@ -275,8 +235,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d261ace8102d2874ebca5ee9e57e2275, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1067,7 +1027,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1e96fa5e7f0744c49a33e0b4d8c20d50, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/scenes/enter_scene.unity

@@ -212,8 +212,8 @@ MonoBehaviour:
   enableLog: 0
   networkType: 1
   tokens:
-  - appid: 
+  - appid: 4bd4464b39394188a6708fee41f352f7
-    serverUrl: 
+    serverUrl: https://ta.perfeggsgame.com
     mode: 0
     timeZone: 1
     timeZoneId: 
@@ -392,7 +392,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2a2ec6ba1ee8b48749524f015ed572a6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  devKey: 
+  devKey: XHsvoUhhNvMamKMSEvrew3
   iosDevKey: 
   appID: 
   UWPAppID: 

BFVersions/android/dz_dev/unityLibrary/src/main/AndroidManifest.xml

@@ -31,7 +31,7 @@
     <!-- Sample AdMob App ID: ca-app-pub-3940256099942544~3347511713 -->
     <meta-data
         android:name="com.google.android.gms.ads.APPLICATION_ID"
-        android:value="ca-app-pub-8252390069143459~5647580719"/>
+        android:value="ca-app-pub-8252390069143459~1326835946"/>
     <meta-data
         android:name="com.google.android.gms.ads.flag.OPTIMIZE_INITIALIZATION"
         android:value="true"/>

BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml

@@ -32,7 +32,7 @@
     <!-- Sample AdMob App ID: ca-app-pub-3940256099942544~3347511713 -->
     <meta-data
         android:name="com.google.android.gms.ads.APPLICATION_ID"
-        android:value="ca-app-pub-8252390069143459~5647580719"/>
+        android:value="ca-app-pub-8252390069143459~1326835946"/>
     <meta-data
         android:name="com.google.android.gms.ads.flag.OPTIMIZE_INITIALIZATION"
         android:value="true"/>

BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml

@@ -43,7 +43,7 @@
     <meta-data android:name="unity.allow-resizable-window" android:value="False" />
     <meta-data
         android:name="com.google.android.gms.ads.APPLICATION_ID"
-        android:value="ca-app-pub-8252390069143459~5647580719"/>
+        android:value="ca-app-pub-8252390069143459~1326835946"/>
     <meta-data
         android:name="com.google.android.gms.ads.flag.OPTIMIZE_INITIALIZATION"
         android:value="true"/>

BFVersions/android/dz_release/unityLibrary/src/main/AndroidManifest.xml

@@ -19,7 +19,7 @@
     <!-- Sample AdMob App ID: ca-app-pub-3940256099942544~3347511713 -->
     <meta-data
         android:name="com.google.android.gms.ads.APPLICATION_ID"
-        android:value="ca-app-pub-8252390069143459~5647580719"/>
+        android:value="ca-app-pub-8252390069143459~1326835946"/>
     <meta-data
         android:name="com.google.android.gms.ads.flag.OPTIMIZE_INITIALIZATION"
         android:value="true"/>