123 1 year ago
parent
commit
8591b86177

BIN
Assets/Content/Raw_Art/UI/UILanuch/img_logo_01.png


+ 2 - 2
Assets/Lua/Core/PlatformPack.lua

@@ -1,8 +1,8 @@
 local PlatformPack = {
 	URL_KEY = 'http://103.239.245.64:81//',
 	SERVERLIST_URL = 'http://103.239.245.64:81//serverlist',
-	NOTIFY_URL = 'http://103.239.245.64:88//res/TestServerNotice/',
-	SPECIAL_INFO_URL = 'http://103.239.245.64:88//res/Channel/agreement.json',
+	NOTIFY_URL = 'http://weix.vvfyj.cn:88/res/TestServerNotice/',
+	SPECIAL_INFO_URL = 'http://weix.vvfyj.cn:88/res/Channel/agreement.json',
 	CUSTOMER_SERVICE_INFO_URL = 'http://103.239.245.64:81//vipService',
 }
 

+ 1 - 1
Assets/Src/Core/DownLoad/DownloadMgr.cs

@@ -119,7 +119,7 @@ public class DownloadMgr : Singleton<DownloadMgr>
 #if GAME_ONE
         return "http://101.43.46.101:88/";
 #elif CN_I7GAME_0_1
-        return "http://103.239.245.64:88/";
+        return "http://weix.vvfyj.cn:88/";//"http://103.239.245.64:88/";
 #elif GAME_DEBUG
          return "http://110.40.223.119:88/";
 #else

+ 2 - 2
ProjectSettings/ProjectSettings.asset

@@ -137,7 +137,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0.0.6
+  bundleVersion: 0.1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -845,7 +845,7 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE;CN_I7GAME_0_1
+    Android: USE_LUA;VUPLEX_CCU
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
     iPhone: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE;CN_I7GAME_0_1

+ 64 - 64
UserSettings/Layouts/default-2021.dwlt

@@ -43,7 +43,7 @@ MonoBehaviour:
     width: 1304
     height: 903
   m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Console
   m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -97,7 +97,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 10361
+  controlID: 20
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -193,7 +193,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 44
+  controlID: 53
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -213,12 +213,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 926
+    width: 849
     height: 853
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 45
+  controlID: 54
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -238,12 +238,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 926
-    height: 442
+    width: 849
+    height: 565
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 46
+  controlID: 91
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -261,10 +261,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 376
-    height: 442
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 346
+    height: 565
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -285,12 +285,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 376
+    x: 346
     y: 0
-    width: 550
-    height: 442
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+    width: 503
+    height: 565
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -313,11 +313,11 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 442
-    width: 926
-    height: 411
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
+    y: 565
+    width: 849
+    height: 288
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 19}
@@ -339,12 +339,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 926
+    x: 849
     y: 0
-    width: 378
+    width: 455
     height: 853
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 21}
@@ -535,8 +535,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 603
     y: 132
-    width: 375
-    height: 421
+    width: 345
+    height: 544
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -545,23 +545,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: 2c8afcff7c8afcff9293fcffac8afefffc8afeffb08efeffbe8efeffc490feff1491feffc894feffd694feffb496feff0497feffb89afeffc69afeffa49cfefff49cfeffa8a0feffb6a0feff9ea2feffeea2feffa2a6feffb0a6feff2cb2ffff8cb9ffff1ce2ffff6ce2ffff1ee6ffff2ce6ffffe4fafffff4ffffff
+      m_SelectedIDs: f011e8ff
+      m_LastClickedID: -1568272
+      m_ExpandedIDs: 3212e8ff9013e8ff9813e8ffa413e8ff5024e8ffae25e8ffb625e8ffc225e8ffb2eee8ff02efe8ff52f2e8ff60f2e8ffca85e9ff1a86e9ffce89e9ffdc89e9ff689de9ffb89de9ff6ca1e9ff7aa1e9ff689bf2ff1ca3f2ffd4a4f2ff64a7f2ff40aef2ffa423f4ffc423f4ff822bf4ff3a2df4ffca2ff4ffa636f4ffa2bbf6fff2bbf6ffa6bff6ffb4bff6ff9afbfaff52fdfaffe2fffaffbe06fbffb263fcff6a65fcfffa67fcffd66efcffe4fafffff4ffffff305e0000260a0a00f84b0a00
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: DownloadTask_2
-        m_OriginalName: DownloadTask_2
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -18054
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 11}
       m_SearchString: 
@@ -592,10 +592,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 979
+    x: 949
     y: 132
-    width: 548
-    height: 421
+    width: 501
+    height: 544
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -864,9 +864,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.4551831, y: -2.6037493, z: 0.723497}
+    m_Target: {x: 0.5859593, y: -1.9166076, z: 0.5169371}
     speed: 2
-    m_Value: {x: 0.4551831, y: -2.6037493, z: 0.723497}
+    m_Value: {x: 0.5859593, y: -1.9166076, z: 0.5169371}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -917,9 +917,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 1.7347417
+    m_Target: 2.3859026
     speed: 2
-    m_Value: 1.7347417
+    m_Value: 2.3859026
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -937,7 +937,7 @@ MonoBehaviour:
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: -0.011972203, y: 0.9769323, z: -0.20547962, w: -0.056921102}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -966,9 +966,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 603
-    y: 574
-    width: 925
-    height: 390
+    y: 697
+    width: 848
+    height: 267
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -985,23 +985,23 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Content/Raw_Art
+    - Assets/StreamingAssets
     m_Globs: []
     m_OriginalText: 
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Content/Raw_Art
+  - Assets/StreamingAssets
   m_LastFoldersGridSize: 16
   m_LastProjectPath: E:\Project\Unity\bt_client_2022_S
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 751}
-    m_SelectedIDs: 305f0000
-    m_LastClickedID: 24368
-    m_ExpandedIDs: 00000000be5e0000e25e00002e5f0000305f00003c5f0000445f0000dc620000c0e001002ce101003ae10100e2e10100
+    scrollPos: {x: 0, y: 251}
+    m_SelectedIDs: 12f50800
+    m_LastClickedID: 587026
+    m_ExpandedIDs: 00000000785e00007a5e00007c5e00007e5e0000805e0000825e0000865e0000885e00008a5e00008c5e00008e5e0000b236020000fa080000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1029,7 +1029,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 
+    m_ExpandedIDs: 00000000785e00007a5e00007c5e00007e5e0000805e0000825e0000845e0000865e0000885e00008a5e00008c5e00008e5e0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1054,21 +1054,21 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: dc620000
-    m_LastClickedInstanceID: 25308
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: c62300002cdf01008cb00c0000cf0c0076280d00000000007e660c0098660c0060940c0008a10c00e6950c008ec90c0002610000604e0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: Monster_1
-      m_OriginalName: Monster_1
+      m_Name: MacOS
+      m_OriginalName: MacOS
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 123476
+      m_UserData: 588574
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0
@@ -1107,9 +1107,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 603
-    y: 574
-    width: 925
-    height: 390
+    y: 697
+    width: 848
+    height: 267
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -1136,9 +1136,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1529
+    x: 1452
     y: 132
-    width: 377
+    width: 454
     height: 832
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -1148,7 +1148,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 204
+    m_CachedPref: 198
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1