1

GameClient/.idea/.idea.GameClient/.idea/indexLayout.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="UserContentModel">
-    <attachedFolders />
-    <explicitIncludes />
-    <explicitExcludes />
-  </component>
-</project>

GameClient/Assets/AssetBundleBuilderSetting.asset

@@ -19,4 +19,4 @@ MonoBehaviour:
   OutputNameStyle: 1
   CopyBuildinFileOption: 0
   CopyBuildinFileTags: preload
-  EncyptionClassName: EncryptionNone
+  EncyptionClassName: FileOffsetEncryption

GameClient/Assets/Game/HotUpdate/Game.HotUpdate.asmdef

@@ -6,7 +6,9 @@
         "GUID:7a41fac89c3ce014e99efb3723e6a98e",
         "GUID:e34a5702dd353724aa315fb8011f08c3",
         "GUID:b0a84d582f6a6fa4185f67ce934d99c2",
-        "GUID:6e5063adab271564ba0098a06a8cebda"
+        "GUID:6e5063adab271564ba0098a06a8cebda",
+        "GUID:d9a5d47c553a04a28a7d21a3f3fc8dc3",
+        "GUID:9b1c19877f4294a9cb33ff38fc9f1c83"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerActivityView.cs

@@ -123,6 +123,13 @@ namespace GFGGame
                 return;
             }
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLimitId);
+            if (actLimitId <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                Timers.inst.Remove(UpdateTime);
+                OnClickBtnBack();
+                return;
+            }
             long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
             string strTime = TimeUtil.FormattingTimeTo_DD_HH_mm(time);
             string[] str = strTime.Split(':');

GameClient/Assets/Icons.meta

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

GameClient/Assets/Plugins/Android/AndroidManifest.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 65f88a7463737a843aa44b1fe710bad7
+guid: 6493bc54a46b5a240abe99fece86f948
 TextScriptImporter:
   externalObjects: {}
   userData: 

GameClient/Assets/Plugins/Android/assets/hykb_anti.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 24105c86e7fb30e48a6750630feda58d
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/assets/hykb_auxs.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 687b83a3c0e9ba24fa90c8119e5346c7
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/assets/hykb_login.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 30f5da738acdcaf47a832db3efbe0423
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/assets/hykb_pay.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3175f16d15f2c5941b27fcc0ffa661f5
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/res/mipmap-hdpi.meta

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

GameClient/Assets/Plugins/Android/res/mipmap-hdpi/ic_launcher.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 555f47f3f51e51a4a901f2155c65de28
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/res/mipmap-hdpi/ic_launcher_foreground.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 073a42ebb82de4d4095ee1ee9a206883
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/res/mipmap-hdpi/ic_launcher_round.png.meta

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

GameClient/Assets/Plugins/Android/res/mipmap-ldpi.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 985ff2b4b7ab60e429f3b734fee189ec
+guid: 65502742369c29e4cb6218c2801348f3
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Plugins/Android/res/mipmap-ldpi/ic_launcher.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 95790db468915994cbd975e0aa8e2ed4
+guid: 0322f7bfbda90f945b063904d0970dcf
 DefaultImporter:
   externalObjects: {}
   userData: 

GameClient/Assets/Plugins/Android/res/mipmap-ldpi/ic_launcher_foreground.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 71e87c616e727fc448d5c56bc9b4a9e2
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/res/mipmap-ldpi/ic_launcher_round.png.meta

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

GameClient/Assets/Plugins/Android/res/mipmap-mdpi.meta

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

GameClient/Assets/Plugins/Android/res/mipmap-mdpi/ic_launcher.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 603a094cf5cde674880ab3be174d8e88
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/res/mipmap-mdpi/ic_launcher_foreground.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 605836398078a4c4ca8935b5ef1e58f2
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/res/mipmap-mdpi/ic_launcher_round.png.meta

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

GameClient/Assets/Plugins/Android/res/mipmap-xhdpi.meta

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

GameClient/Assets/Plugins/Android/res/mipmap-xhdpi/ic_launcher.png.meta

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

GameClient/Assets/Plugins/Android/res/mipmap-xhdpi/ic_launcher_foreground.png.meta

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

GameClient/Assets/Plugins/Android/res/mipmap-xhdpi/ic_launcher_round.png.meta

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

GameClient/Assets/Plugins/Android/res/mipmap-xxhdpi.meta

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

GameClient/Assets/Plugins/Android/res/mipmap-xxhdpi/ic_launcher.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 6e386c45e81e5d34d928c2119342ed29
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/res/mipmap-xxhdpi/ic_launcher_foreground.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 21a703c02b980d94e8c32484705daa6c
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/res/mipmap-xxhdpi/ic_launcher_round.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 72eb36c892586b54a882513dff500ef6
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/res/mipmap-xxxhdpi.meta

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

GameClient/Assets/Plugins/Android/res/mipmap-xxxhdpi/ic_launcher.png.meta

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

GameClient/Assets/Plugins/Android/res/mipmap-xxxhdpi/ic_launcher_foreground.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 44a08833b98e7744faf929db8d08441c
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/res/mipmap-xxxhdpi/ic_launcher_round.png.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3e10b72fbf5271f499ebcffcf7059ee4
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ThirdParty/Bugly/Plugins/BuglyPlugins/iOS/Bugly.framework/Bugly.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD:GameClient/Assets/Plugins/Android/res/mipmap-ldpi/ic_launcher.png.meta
+guid: e6023d29d3fefd14f9c937a906bf7dfb
+=======
 guid: 0dd2027a6278544d4acc46c208b9f5f5
+>>>>>>> remotes/origin/master:GameClient/Assets/ThirdParty/Bugly/Plugins/BuglyPlugins/iOS/Bugly.framework/Bugly.meta
 DefaultImporter:
   externalObjects: {}
   userData: