gdl_123 hace 7 meses
padre
commit
a6c9f7b37a

+ 6 - 6
Assets/Content/Prefabs/UI/UITitle/TitleListItem.prefab

@@ -229,7 +229,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 350, y: -194.5}
+  m_AnchoredPosition: {x: 350, y: -225.5}
   m_SizeDelta: {x: 439.61, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &23429598721877723
@@ -545,7 +545,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 929, y: 255.32}
+  m_SizeDelta: {x: 929, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2280018252135588065
 CanvasRenderer:
@@ -614,7 +614,7 @@ MonoBehaviour:
   m_IgnoreLayout: 0
   m_MinWidth: -1
   m_MinHeight: 300
-  m_PreferredWidth: 929
+  m_PreferredWidth: -1
   m_PreferredHeight: -1
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
@@ -1876,7 +1876,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 520.335, y: -67}
+  m_AnchoredPosition: {x: 520.335, y: -82.5}
   m_SizeDelta: {x: 340.67, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4478492961289839101
@@ -1920,7 +1920,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u6311\u6230BOSS\u5931\u8D25100\u6B21"
+  m_Text: "\u6311\u6230BOSS\u5931\u8D25100\u6B21\n"
 --- !u!114 &2746585679052485420
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1996,7 +1996,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 350, y: -143.5}
+  m_AnchoredPosition: {x: 350, y: -174.5}
   m_SizeDelta: {x: 439.61, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8723443420877256899

+ 16 - 26
Assets/Content/Prefabs/UI/UITitle/UITitleList.prefab

@@ -203,7 +203,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3000038999013844878}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
   m_Name: 
@@ -229,7 +229,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3000038999013844878}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
@@ -461,7 +461,7 @@ MonoBehaviour:
     m_Top: 30
     m_Bottom: 0
   mItemPadding: {x: 0, y: 30}
-  mItemSize: {x: 0, y: 0}
+  mItemSize: {x: 940, y: 330}
   mItemRecycleDistance: {x: 50, y: 50}
   mItemSnapEnable: 0
   mGridFixedType: 0
@@ -2436,7 +2436,7 @@ PrefabInstance:
     - target: {fileID: 1384384642977197418, guid: c5efd07263fc8a94d9281bc6a0f64b35,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -143.5
+      value: -174.5
       objectReference: {fileID: 0}
     - target: {fileID: 2280018252135588078, guid: c5efd07263fc8a94d9281bc6a0f64b35,
         type: 3}
@@ -2548,6 +2548,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5232234796048461557, guid: c5efd07263fc8a94d9281bc6a0f64b35,
+        type: 3}
+      propertyPath: m_MinHeight
+      value: 330
+      objectReference: {fileID: 0}
+    - target: {fileID: 5232234796048461557, guid: c5efd07263fc8a94d9281bc6a0f64b35,
+        type: 3}
+      propertyPath: m_PreferredWidth
+      value: -1
+      objectReference: {fileID: 0}
     - target: {fileID: 6139014109884046518, guid: c5efd07263fc8a94d9281bc6a0f64b35,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -2571,7 +2581,7 @@ PrefabInstance:
     - target: {fileID: 6139014109884046518, guid: c5efd07263fc8a94d9281bc6a0f64b35,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -194.5
+      value: -225.5
       objectReference: {fileID: 0}
     - target: {fileID: 6440328604108927596, guid: c5efd07263fc8a94d9281bc6a0f64b35,
         type: 3}
@@ -2621,7 +2631,7 @@ PrefabInstance:
     - target: {fileID: 8750505624349977298, guid: c5efd07263fc8a94d9281bc6a0f64b35,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -67
+      value: -82.5
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c5efd07263fc8a94d9281bc6a0f64b35, type: 3}
@@ -2637,23 +2647,3 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 3892806719437887071}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &5232234796048461557
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3000038999351604913}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: 929
-  m_PreferredHeight: 255.32
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1

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

@@ -1,9 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://110.40.223.119:81//',
-	SERVERLIST_URL = 'http://110.40.223.119:81//serverlist',
-	NOTIFY_URL = 'http://110.40.223.119:88/res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
+	URL_KEY = 'http://165.154.215.99:81//',
+	SERVERLIST_URL = 'http://165.154.215.99:81//serverlist',
+	NOTIFY_URL = 'http://165.154.215.99:88/res/NoticeNew/',
+	SPECIAL_INFO_URL = 'http://165.154.215.99:81//channel',
+	CUSTOMER_SERVICE_INFO_URL = 'http://165.154.215.99:81//vipService',
 }
 
 return PlatformPack

+ 1 - 1
Build/BuildDependenceResource/CurPackEnv.ini

@@ -1 +1 @@
-{"m_ChannelUniqueId":"12002022","m_BuildClassName":"Pack.PackPlatformAndroid"}
+{"m_ChannelUniqueId":"12002023","m_BuildClassName":"Pack.PackPlatformAndroid"}

+ 4 - 4
ProjectSettings/ProjectSettings.asset

@@ -138,7 +138,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0.0.6
+  bundleVersion: 1.0.0.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -159,7 +159,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.xjro.rutest
+    Android: com.xjroapp.ru
     WebGL: com.wt.no.sdk.test
     iPhone: com.qscq.joy
   buildNumber:
@@ -167,7 +167,7 @@ PlayerSettings:
     iPhone: 0.1.0.0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 1000006
+  AndroidBundleVersionCode: 1000000
   AndroidMinSdkVersion: 23
   AndroidTargetSdkVersion: 36
   AndroidPreferredInstallLocation: 1
@@ -846,7 +846,7 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU;FPS_DISABLE;GAME_DEBUG
+    Android: USE_LUA;VUPLEX_CCU;FPS_DISABLE
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
     iPhone: USE_LUA;VUPLEX_CCU