Merge remote-tracking branch 'remotes/origin/guodong'

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

GameClient/Assets/Editor/Excel/ExcelScanner.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GFGEditor
+{
+    public class ExcelScanner
+    {
+        public static void StartScan()
+        {
+            //写入商店物品类型Index
+            ShopScanner.StartScan(); ;
+            //扫描物品表获取途径并更新数据库
+            ItemApproachScanner.startScan();
+            //扫描副本
+            InstanceZonesScanner.StartScan();
+            //写入卡牌最大等级
+            CardScanner.StartScan();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Net/Entity/GameResult.cs.meta → GameClient/Assets/Editor/Excel/ExcelScanner.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d6a56042fb07bcf4493d02828b675381
+guid: 8e2aedd14cd2b83479591f39dd77c6fe
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Editor/ToolsMenu.cs

@@ -127,14 +127,8 @@ namespace GFGEditor
             {
                 SQLiteHelper.Instance.CloseConnection();
             }
-            //写入商店物品类型Index
-            ShopScanner.StartScan();;
-            //扫描物品表获取途径并更新数据库
-            ItemApproachScanner.startScan();
-            //扫描副本
-            InstanceZonesScanner.StartScan();
-            //写入卡牌最大等级
-            CardScanner.StartScan();
+            //开始扫描表格，自动生成部分数据
+            ExcelScanner.StartScan();
             AssetDatabase.Refresh();
             EditorUtility.ClearProgressBar();
         }

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -143,6 +143,7 @@ namespace GFGGame
             {
                 ViewManager.Show<LoginInputView>();
             }
+            LoginController.Logout();
         }
 
         //注销

GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -23,7 +23,7 @@ namespace GFGGame
         {
             ViewManager.Show<ModalStatusView>("登录中...");
             int errorCode = await ET.LoginHelper.Login(GameGlobal.zoneScene, ET.ConstValue.LoginAddress, account, password, isMD5);
-            ViewManager.Hide<ModalStatusView>();
+            
             if (errorCode == ET.ErrorCode.ERR_Success)
             {
                 GameGlobal.isVisitor = false;
@@ -55,6 +55,7 @@ namespace GFGGame
             }
             else
             {
+                ViewManager.Hide<ModalStatusView>();
                 if (ErrorCodeController.Handler(errorCode))
                 {
                     ViewManager.Show<LoginInputView>();
@@ -62,17 +63,23 @@ namespace GFGGame
             }
         }
 
+        public static void Logout()
+        {
+            GameGlobal.zoneScene.GetComponent<SessionComponent>().Session?.Dispose();
+        }
+
         public static async ETTask Register(string account, string password, string name, string identityNum, string code)
         {
             ViewManager.Show<ModalStatusView>("注册中...");
             int errorCode = await LoginHelper.Register(GameGlobal.zoneScene, ET.ConstValue.LoginAddress, account, password, name, identityNum, code);
-            ViewManager.Hide<ModalStatusView>();
+            
             if (errorCode == ErrorCode.ERR_Success)
             {
                 Login(account, password).Coroutine();
             }
             else
             {
+                ViewManager.Hide<ModalStatusView>();
                 ErrorCodeController.Handler(errorCode);
             }
         }
@@ -119,15 +126,18 @@ namespace GFGGame
             else
             {
                 GameGlobal.isFirstEntry = true;
+                ViewManager.Hide<ModalStatusView>();
                 GameController.ShowCreateRole();
             }
         }
 
         public static async ETTask ReqCreateRole(string roleName)
         {
+            ViewManager.Show<ModalStatusView>("创建角色中...");
             int errorCode = await ET.LoginHelper.CreateRole(GameGlobal.zoneScene, roleName);
             if (errorCode != ErrorCode.ERR_Success)
             {
+                ViewManager.Hide<ModalStatusView>();
                 ErrorCodeController.Handler(errorCode);
                 return;
             }
@@ -158,6 +168,7 @@ namespace GFGGame
                 return;
             }
             await GameController.PreEnterGameAsync();
+            ViewManager.Hide<ModalStatusView>();
         }
     }
 }

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/ConstValue.cs

@@ -3,6 +3,6 @@
     public static class ConstValue
     {
         public const string LoginAddress = "10.108.64.190:10005";
-        //  public const string LoginAddress = "127.0.0.1:10005";
+        //public const string LoginAddress = "127.0.0.1:10005";
     }
 }

GameClient/Assets/Game/HotUpdate/Net/Const.meta

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

GameClient/Assets/Game/HotUpdate/Net/Const/GameProtoId.cs

@@ -1,25 +0,0 @@
-namespace GFGGame
-{
-    public class GameProtoId
-    {
-        public const int GET_ROLE_INFO = 1;
-        public const int CREATE_ROLE = 2;
-        public const int UPDATE_TREASURE = 3;
-        public const int UPDATE_STORY_PROGRESS = 4;
-        public const int GET_STORY_SCORE_LIST = 5;
-        public const int UPDATE_STORY_SCORE = 6;
-        public const int GET_STORY_STAR_LIST = 7;
-        public const int UPDATE_STORY_STAR = 8;
-        // public const int GET_ROLE_SUIT_LIST = 9;
-        public const int UPDATE_ROLE_SUIT = 10;
-        public const int UPDATE_ROLE_SUIT_INDEX = 11;
-        // public const int GET_ROLE_ITEM_LIST = 12;
-        public const int UPDATE_ROLE_ITEMS = 13;
-        public const int UPDATE_ROLE_GUIDE = 14;
-        public const int GET_TIME = 15;//心跳
-        public const int UPDATE_RECHARGE_TIME = 16;
-        public const int UPDATE_RECOMMEND_COUNT = 17;
-        public const int UPDATE_SYSTEM_SUIT_BOX_STATUS = 18;
-        public const int UPDATE_ROLE_CARD = 19;
-    }
-}

GameClient/Assets/Game/HotUpdate/Net/Const/GameProtoId.cs.meta

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

GameClient/Assets/Game/HotUpdate/Net/Entity/GameResult.cs

@@ -1,105 +0,0 @@
-using System.Collections.Generic;
-
-namespace GFGGame
-{
-    public class GameResult : HttpResult
-    {
-        public RoleInfo roleInfo;
-        public List<StoryScore> storyScoreList;
-        public List<StoryStar> storyStarList;
-        public List<RoleSuit> roleSuitList;
-        public List<RoleItem> roleItemList;
-        public List<GuideData> roleGuideList;
-        public List<SystemSuit> systemSuitList;
-        public List<RoleCard> roleCardList;
-        public List<SkillData> roleSkillList;
-    }
-
-    public class RoleInfo
-    {
-        public long id;
-        public string name;
-        public int power;
-        public int gold;
-        public int exp;
-        public int lvl;
-        public int diaP;
-        public int diaR;
-        public int chapter;
-        public int chapterLvl;
-        public int passAll;
-        public int suitIndex;
-        public int powerTime;
-        public int onlineTimeSecs;
-        public int onlineDurationSecs;
-        public int onlineDurationSecsDay;
-        public int rechargeTime;
-        public int rechargeTotal;
-        public int rechargeTotalMon;
-        public int recommendCount;
-        public int recommendDay;
-        public int chapterJY;
-        public int chapterLvlJY;
-        public long serverTime = 0;
-    }
-
-    public class StoryScore
-    {
-        public string lvlId;
-        public int score;
-        public long roleId;
-    }
-    public class StoryStar
-    {
-        public int chapterId;
-        public int star;
-        public long roleId;
-        public string boxStatus;
-    }
-
-    public class RoleSuit
-    {
-        public int pos;
-        public long roleId;
-        public string equipIds;
-        public int bg;
-        public int pic;
-        public int suitId;
-    }
-
-    public class RoleItem
-    {
-        public int itemId;
-        public int num;
-    }
-
-    public class GuideData
-    {
-
-        public int guideId;
-        public int count;
-    }
-
-    public class SystemSuit
-    {
-        public int suitId;
-        public long roleId;
-        public int boxStatus;
-        public int boxStatusSyn;
-    }
-
-    public class RoleCard
-    {
-        public long roleId;
-        public int cardId;
-        public int lv;
-        public int exp;
-        public int star;
-        public string res;
-        public int score1;
-        public int score2;
-        public int score3;
-        public int score4;
-        public int score5;
-    }
-}

GameClient/Assets/Game/HotUpdate/Net/Proxy/GameProxy.cs

@@ -1,270 +0,0 @@
-using LitJson;
-using System;
-using System.Collections.Generic;
-
-namespace GFGGame
-{
-    public class GameProxy
-    {
-        private const string API_GAME = "game";
-
-        public static void ReqRoleInfo(long id)
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("id", id);
-            Post(GameProtoId.GET_ROLE_INFO, "roleInfo", data, (GameResult result) =>
-            {
-                if (result == null || result.code == 0)
-                {
-                    if (result != null && result.roleInfo != null)
-                    {
-                        //GameController.PreEnterGame(result);
-                    }
-                    else
-                    {
-                        GameController.ShowCreateRole();
-                    }
-                }
-
-            });
-        }
-
-        public static void ReqCreateRole(long id, string name)
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("id", id, "name", name);
-            Post(GameProtoId.CREATE_ROLE, "roleInfo", data, (GameResult result) =>
-            {
-                if (result == null || result.code == 0)
-                {
-                    ViewManager.Hide(ViewName.CREATE_ROLE_VIEW);
-                    GameGlobal.isFirstEntry = true;
-                    //GameController.PreEnterGame(result);
-                    if (GameGlobal.skipGuide)
-                    {
-                        ReqUpdateStoryProgress(10, 100, 100010, 10100);
-                        //RoleDataManager.lvl = 100;
-                    }
-                }
-            });
-        }
-
-        public static void ReqUpdateTreasure()
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("id", RoleDataManager.roleId
-                                                                    //"power", RoleDataManager.power,
-                                                                    //"gold", RoleDataManager.gold,
-                                                                    //"exp", RoleDataManager.exp,
-                                                                    //"lvl", RoleDataManager.lvl,
-                                                                    //"diaP", RoleDataManager.diaP,
-                                                                    //"diaR", RoleDataManager.diaR
-                                                                    //"powerTime", RoleDataManager.powerTime
-                                                                    );
-            Post(GameProtoId.UPDATE_TREASURE, "roleInfo", data, (GameResult result) =>
-            {
-
-            });
-        }
-
-        public static void ReqUpdateStoryProgress(int chapter, int chapterLvl, int chapterJY, int chapterLvlJY)
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("chapter", chapter, "chapterLvl", chapterLvl, "chapterJY", chapterJY, "chapterLvlJY", chapterLvlJY, "id", RoleDataManager.roleId);
-            Post(GameProtoId.UPDATE_STORY_PROGRESS, "roleInfo", data, (GameResult result) =>
-            {
-                //StoryDataManager.SetPassData(chapter, chapterLvl);
-                //StoryDataManager.SetPassData(chapterJY, chapterLvlJY);
-            });
-        }
-
-        public static void ReqGetStoryScoreList()
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("id", RoleDataManager.roleId);
-            Post(GameProtoId.GET_STORY_SCORE_LIST, "roleInfo", data, (GameResult result) =>
-            {
-                if (result != null && result.storyScoreList != null)
-                {
-                    //StoryDataManager.InitScoreList(result.storyScoreList);
-                }
-                else
-                {
-                    //StoryDataManager.InitScoreList(null);
-                }
-            });
-        }
-
-        public static void ReqUpdateStoryScore(string lvlId, int score)
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("lvlId", lvlId, "score", score, "roleId", RoleDataManager.roleId);
-            Post(GameProtoId.UPDATE_STORY_SCORE, "storyScore", data, (GameResult result) =>
-            {
-
-            });
-        }
-
-        public static void ReqGetStoryStarList()
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("id", RoleDataManager.roleId);
-            Post(GameProtoId.GET_STORY_STAR_LIST, "roleInfo", data, (GameResult result) =>
-            {
-                if (result != null && result.storyStarList != null)
-                {
-                    //StoryDataManager.InitStarList(result.storyStarList);
-                }
-                else
-                {
-                    //StoryDataManager.InitStarList(null);
-                }
-            });
-        }
-
-        public static void ReqUpdateStoryStar(int chapterId, int star, string boxStatus)
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("chapterId", chapterId, "star", star, "roleId", RoleDataManager.roleId, "boxStatus", boxStatus);
-            Post(GameProtoId.UPDATE_STORY_STAR, "storyStar", data, (GameResult result) =>
-            {
-
-            });
-        }
-
-        public static void ReqUpdateRoleSuit(CustomSuitData suitSavedData)
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("pos", suitSavedData.pos,
-                                                                    "roleId", RoleDataManager.roleId,
-                                                                    //"equipIds", ArrayUtil<int>.JoinArrayToString(suitSavedData.equipDatas),
-                                                                    "bg", suitSavedData.bg,
-                                                                    "pic", suitSavedData.pic,
-                                                                    "suitId", suitSavedData.suitId
-                                                                    );
-            Post(GameProtoId.UPDATE_ROLE_SUIT, "roleSuit", data, (GameResult result) =>
-            {
-
-            });
-        }
-
-        public static void ReqUpdateRoleSuitIndex(int suitIndex)
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("suitIndex", suitIndex, "id", RoleDataManager.roleId);
-            Post(GameProtoId.UPDATE_ROLE_SUIT_INDEX, "roleInfo", data, (GameResult result) =>
-            {
-
-            });
-        }
-
-        public static void ReqUpdateRoleItems(List<RoleItem> itemList)
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("roleId", RoleDataManager.roleId, "itemList", itemList);
-            Post(GameProtoId.UPDATE_ROLE_ITEMS, "roleItemList", data, (GameResult result) =>
-            {
-
-            });
-        }
-
-        public static void ReqUpdateRoleGuide(GuideData guideData)
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("guideId", guideData.guideId,
-                                                                    "roleId", RoleDataManager.roleId,
-                                                                    "count", guideData.count
-                                                                    );
-            Post(GameProtoId.UPDATE_ROLE_GUIDE, "roleGuide", data, (GameResult result) =>
-            {
-
-            });
-        }
-
-        public static void ReqUpdateTime()
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("id", RoleDataManager.roleId);
-            Post(GameProtoId.GET_TIME, "roleInfo", data, (GameResult result) =>
-            {
-                if (result != null && result.roleInfo != null)
-                {
-                    //ServerDataManager.SetServerTime(result.roleInfo.serverTime);
-                    AntiAddictionController.CheckOnlineTime(result.roleInfo.onlineTimeSecs, result.roleInfo.onlineDurationSecs, result.roleInfo.onlineDurationSecsDay);
-                    RoleDataManager.rechargeTotalMon = result.roleInfo.rechargeTotalMon;
-                }
-            });
-        }
-
-        public static void ReqUpdateRecommendCount(int recommendCount)
-        {
-            //int day = StoryDataManager.recommendDay;
-            //Dictionary<string, object> data = JsonUtil.createJsonDic("id", RoleDataManager.roleId, "recommendCount", recommendCount, "recommendDay", day);
-            //Post(GameProtoId.UPDATE_RECOMMEND_COUNT, "roleInfo", data, (GameResult result) =>
-            //{
-
-            //});
-        }
-
-        public static void ReqUpdateRecharge(int money)
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("roleId", RoleDataManager.roleId, "money", money);
-            Post(GameProtoId.UPDATE_RECHARGE_TIME, "roleRecharge", data, (GameResult result) =>
-            {
-                if (result != null && result.roleInfo != null)
-                {
-                    RoleDataManager.rechargeTotal = result.roleInfo.rechargeTotal;
-                    RoleDataManager.rechargeTotalMon = result.roleInfo.rechargeTotalMon;
-                }
-            });
-        }
-
-        public static void ReqUpdateSystemSuitBoxStatus(int suitId, int boxStatus, int boxStatusSyn)
-        {
-            Dictionary<string, object> data = JsonUtil.createJsonDic("suitId", suitId, "roleId", RoleDataManager.roleId, "boxStatus", boxStatus, "boxStatusSyn", boxStatusSyn);
-            Post(GameProtoId.UPDATE_SYSTEM_SUIT_BOX_STATUS, "systemSuit", data, (GameResult result) =>
-            {
-
-            });
-        }
-
-        //============================================================
-        public static void ReqUpdateCardStatus(CardData cardData)
-        {
-            int score1 = cardData.scores[ConstDressUpScoreType.SCORE_FENG];
-            int score2 = cardData.scores[ConstDressUpScoreType.SCORE_HUA];
-            int score3 = cardData.scores[ConstDressUpScoreType.SCORE_XUE];
-            int score4 = cardData.scores[ConstDressUpScoreType.SCORE_YUE];
-
-            Dictionary<string, object> data = JsonUtil.createJsonDic("roleId", RoleDataManager.roleId, "cardId", cardData.id, "lv", cardData.lv, "exp", cardData.exp, "star", cardData.star, "res", cardData.resIndex, "score1", score1, "score2", score2, "score3", score3, "score4", score4);
-            Post(GameProtoId.UPDATE_ROLE_CARD, "roleCard", data, (GameResult result) =>
-            {
-                EventAgent.DispatchEvent(ConstMessage.CARD_REFRESH);
-            });
-        }
-        //============================================================
-
-        private static void Get(string methodName, Action<GameResult> callback)
-        {
-            HttpTool.Instance.Get(GameGlobal.gameApiUrl, methodName, (string data) =>
-            {
-                ResultHandler(data, callback);
-            });
-        }
-
-        private static void Post(int protoId, string dataName, object data, Action<GameResult> callback)
-        {
-            string postJsonStr = JsonUtil.createJsonStr("typeid", "" + protoId, dataName, data);
-            HttpTool.Instance.Post(GameGlobal.gameApiUrl, API_GAME, postJsonStr, (string param) =>
-            {
-                ResultHandler(param, callback);
-            });
-        }
-
-        private static void ResultHandler(string data, Action<GameResult> callback)
-        {
-            GameResult resultObj = null;
-            resultObj = null;
-            if (data != null)
-            {
-                resultObj = JsonMapper.ToObject<GameResult>(data);
-            }
-            if (resultObj != null && resultObj.code != 0)
-            {
-                PromptController.Instance.ShowFloatTextPrompt(resultObj.message);
-            }
-
-            if (callback != null)
-            {
-                callback(resultObj);
-            }
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/Net/Proxy/GameProxy.cs.meta

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