Home Explore Help
Register Sign In
hexiaojie
/
Client
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'remotes/origin/master' into GFG

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/GameConfig.cs
hexiaojie 3 days ago
parent
aaf467dc28 814124a0a5
commit
09bc0d8067
3 changed files with 4 additions and 3 deletions
Split View Show Diff Stats
  1. 2 2
      GameClient/Assets/Game/HotUpdate/GameConfig.cs
  2. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Store/StoreBrocadeWeavView.cs
  3. 1 0
      GameClient/GameClient.sln.DotSettings.user

+ 2 - 2
GameClient/Assets/Game/HotUpdate/GameConfig.cs
View File 

@@ -32,8 +32,8 @@ namespace GFGGame
 
             var result = JsonMapper.ToObject<Result>(json);
 
             LoginAddress = result.loginApiUrl;
 
             //LoginAddress = "43.139.184.240:10003";
 
-            // LoginAddress = "43.139.184.240:10003";//测试地址
 
-           //LoginAddress = "192.168.1.191:10005";//测试地址
 
+            //LoginAddress = "192.168.1.7:10005";//测试地址
 
+            //LoginAddress = "192.168.1.191:10005";//测试地址
 
             showGM = int.Parse(result.showGM);
 
             if(!string.IsNullOrEmpty(result.openTime))
 
             {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Store/StoreBrocadeWeavView.cs
View File 

@@ -169,7 +169,7 @@ namespace GFGGame
 
         {
 
             var dataManager = BattlePassTaskDataManager.Instance;
 
             var allSpecialCfg = dataManager.GetAllSpecialCfg();
 
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(allSpecialCfg[0].Key);
 
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(allSpecialCfg[1].Key);
 
             var suitId = itemCfg.suitId;
 
             int _suitTypeId = 0;
 
             for (int i = 0; i < SuitGuideMenuCfgArray.Instance.dataArray.Length; i++)

+ 1 - 0
GameClient/GameClient.sln.DotSettings.user
View File 

@@ -3,5 +3,6 @@
 
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABuildTarget_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8d4895b259be41298a685a0c9b42357576b400_003F19_003F63e803e6_003FBuildTarget_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditorUserBuildSettings_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8d4895b259be41298a685a0c9b42357576b400_003Fb1_003F2d17cdd6_003FEditorUserBuildSettings_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditorUtility_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8d4895b259be41298a685a0c9b42357576b400_003F3f_003Fa805acc1_003FEditorUtility_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGameObject_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F683a2b31bf9142429c44f02c75dbc6c913ce00_003F88_003F39e0e101_003FGameObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AOptionAttribute_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F16134578226e4e409ecbdd10473cf8f235000_003F4e_003Fb8b5740c_003FOptionAttribute_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 
 	</wpf:ResourceDictionary>