Merge branch 'master' of http://192.168.2.10:3000/GFG/Client

.gitattributes

@@ -0,0 +1,8 @@
+GameClient/ProjectSettings merge=ours
+GameClient/Assets/Plugins/Android/AndroidManifest.xml merge=ours
+GameClient/Assets/Plugins/Android/baseProjectTemplate.gradle merge=ours
+GameClient/Assets/Plugins/Android/gradleTemplate.properties merge=ours
+GameClient/Assets/Plugins/Android/launcherTemplate.gradle merge=ours
+GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java merge=ours
+GameClient/Assets/Plugins/com/easy/bugly/GamePlayerActivity.java merge=ours
+GameClient/Assets/Plugins merge=ours

.gitignore

@@ -45,6 +45,9 @@
 /GameClient/Assets/StreamingAssets/Bundles.meta
 /GameClient/Assets/StreamingAssets
 /StaticRes
+/GameClient/Assets/Plugins/Android/AndroidManifest.xml
+/GameClient/Assets/Plugins/Android/AndroidManifest.xml.meta
+/GameClient/ProjectSettings/ProjectSettings.asset
 /GameClient/.idea/.idea.GameClient/.idea/indexLayout.xml
 /GameClient/Assets/Plugins/Android/libs/douyou-release.aar
 /GameClient/Assets/Plugins/Android/libs/douyou-release.aar.meta

GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -286,7 +286,7 @@ namespace GFGGame
             List<ActivityDressCfg> zcjbCfgList = new List<ActivityDressCfg>();
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
             zcjbCfgList = ActivityDressCfgArray.Instance.GetCfgsByactivityId(activityId);
-            if(zcjbCfgList == null || zcjbCfgList.Count == 0)
+            if (zcjbCfgList == null || zcjbCfgList.Count == 0)
             {
                 return false;
             }

GameClient/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs

@@ -215,6 +215,7 @@ namespace GFGGame
             foreach (var item in _starDic)
             {
                 var levelCfg = StoryLevelCfgArray.Instance.GetCfg(item.Key);
+                if (levelCfg == null) continue;
                 if (levelCfg.chapterId == chapterID && levelCfg.type == type && levelCfg.subType == subType)
                 {
                     star += item.Value;

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -248,7 +248,7 @@ namespace GFGGame
         public static async ETTask<bool> ReqActivityZCJBInfo(int id = 5006)
         {
             int activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
-            if(activityID != 0)
+            if (activityID != 0)
             {
                 ActivityDataManager.Instance.activityZCJBId = ActivityOpenCfgArray.Instance.GetCfg(activityID).paramsArr[0];
             }

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -70,7 +70,7 @@ namespace GFGGame
 #if PT_DEV
             //外网dev版本
             netType = EnumNetType.LOCAL;
-            cfgName = "cfg_dev";
+            cfgName = "cfg_dev19";
             ChannelId = (int)ChannelID.Test;
 #elif PT_DouYouDev
             netType = EnumNetType.LOCAL;

GameClient/Assets/Plugins/Android/AndroidManifest.xml

@@ -18,7 +18,7 @@
     <application
         android:allowBackup="true"
 		android:icon="@drawable/ic_launcher"
-		android:label="万世镜local">
+		android:label="万世镜Dev">
 		<activity android:name="com.unity3d.player.UnityPlayerActivity"
             android:configChanges="mnc|keyboardHidden|screenSize|orientation|keyboard"
             android:screenOrientation="portrait"