ybx_Gdn преди 10 месеца
родител
ревизия
a410632ebe
променени са 22 файла, в които са добавени 13519 реда и са изтрити 11655 реда
  1. 169 1
      Assets/Content/Config/LanguagePackage_cn.csv
  2. 23 8
      Assets/Content/Fonts/BattleFont/BattleFontSDF.asset
  3. 10572 10392
      Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset
  4. 5 2
      Assets/Content/Fonts/colortubeAtlasMaterial50.mat
  5. 895 123
      Assets/Content/Fonts/colortubeSDF.asset
  6. 14 0
      Assets/Content/Prefabs/UI/UIBattle/BattleStatistics.prefab
  7. 159 159
      Assets/Content/Prefabs/UI/UIBattle/UIQuickBattle.prefab
  8. 14 0
      Assets/Content/Prefabs/UI/UICardTips/UICardGot.prefab
  9. 129 129
      Assets/Content/Prefabs/UI/UIExpedition/UIExpedition.prefab
  10. 8 8
      Assets/Content/Prefabs/UI/UIExpedition/UIExpeditionDungeonInfo.prefab
  11. 141 103
      Assets/Content/Prefabs/UI/UIExpedition/UIExpeditionRank.prefab
  12. 134 108
      Assets/Content/Prefabs/UI/UIFashion/UIFashionLvUp.prefab
  13. 137 128
      Assets/Content/Prefabs/UI/UIFilter/UIFilter.prefab
  14. 124 122
      Assets/Content/Prefabs/UI/UIHundredDojo/UIHundredDojo.prefab
  15. 174 187
      Assets/Content/Prefabs/UI/UIHundredDojo/UIHundredDojoSlogan.prefab
  16. 46 32
      Assets/Content/Prefabs/UI/UIPet/UIPetBattle.prefab
  17. 130 132
      Assets/Content/Prefabs/UI/UIPet/UIPetDecompose.prefab
  18. 1 1
      Assets/Editor/AssetBundle/HY_Ios_en.asset
  19. 2 1
      Assets/Lua/UI/UIBattle/UIQuickBattleCtr.lua
  20. 2 2
      Assets/Lua/UI/UIHundredDojo/UIHundredDojoView.lua
  21. 637 14
      Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
  22. 3 3
      ProjectSettings/ProjectSettings.asset

+ 169 - 1
Assets/Content/Config/LanguagePackage_cn.csv

@@ -19021,4 +19021,172 @@ WjBattleBuff_Max,Encouragement limit
 WjBattleBuff_Btn,encouragement
 WjBattleBuff_Dec3,"Each level of encouragement increases {0}% attack power, defense power, and maximum health shield generated by opening by {1}%\n Current encouragement: {2}/{3}"
 WjBattleBuff_Dec4,Whether to consume <color=#00ab65>{0}</color>*<color=#078DF5>{1}</color> and purchase a layer of {2}
-YiJiBai,Defeated
+YiJiBai,Defeated
+key,Language
+string,string
+ActCfg_Name2,7-day goal
+ActCfg_Name31,Pet Exchange Issue 15
+ActCfg_Name114,The King's bounty Issue 40
+ActCfg_Name115,Pet Exchange Issue 31
+ActCfg_Name56,May Day Login Event
+ActCfg_Name124,Accumulated savings during the National Day celebration
+ActCfg_Name1,Login to gift giving
+ActCfg_Name63,520 Witness Love Collection
+ActCfg_Name10003,Carnival Store
+ActCfg_Name18001,Month end accumulated savings
+ActCfg_Name126,Magic Terminator
+ActCfg_Name28,Pet Exchange Issue 12
+ActCfg_Name62,520 Heartbeat Maid
+ActCfg_Name18003,New Year's stored value
+ActCfg_Name120,National Day login activity
+ActCfg_Name61,Nian Beast Returns
+ActCfg_Name14,Outing water production
+ActCfg_Name18005,Arbor Day stored value
+ActCfg_Name122,The King's bounty Issue 2
+ActCfg_Name29,Pet Exchange Issue 13
+ActCfg_Name101,Summer storage activity
+ActCfg_Name20012,National alloy outfit
+ActCfg_Name7,New Year Collection Character
+ActCfg_Name100,Accompanied by Qixi
+ActCfg_Name51,The King's bounty Issue 17
+ActCfg_Name26,Pet Exchange Issue 10
+ActCfg_Name102,Collection in Autumn
+ActCfg_Name207,Pet Exchange Issue 46
+ActCfg_Name50,The King's bounty Issue 16
+ActCfg_Name205,Pet Exchange Issue 44
+ActCfg_Name202,Pet Exchange Issue 41
+ActCfg_Name96,Pet Exchange Issue 28
+ActCfg_Name203,Pet Exchange Issue 42
+ActCfg_Name13,Outing login
+ActCfg_Name49,The King's bounty Issue 15
+ActCfg_Name201,Pet Exchange Issue 40
+ActCfg_Name27,Pet Exchange Issue 11
+ActCfg_Name98,Pet Exchange Issue 30
+ActCfg_Name48,The King's bounty Issue 14
+ActCfg_Name108,The King's bounty Issue 34
+ActCfg_Name209,Pet Exchange Issue 48
+ActCfg_Name110,The King's bounty Issue 36
+ActCfg_Name24,Pet Exchange Issue 8
+ActCfg_Name54,The King's bounty Issue 20
+ActCfg_Name104,Demon sword unsheathed
+ActCfg_Name53,The King's bounty Issue 19
+ActCfg_Name12,Goddess Festival
+ActCfg_Name106,The King's bounty Issue 32
+ActCfg_Name25,Pet Exchange Issue 9
+ActCfg_Name52,The King's bounty Issue 18
+ActCfg_Name85,The King's bounty Issue 30
+ActCfg_Name6,New Year Login
+ActCfg_Name84,The King's bounty Issue 29
+ActCfg_Name43,The King's bounty Issue 9
+ActCfg_Name20033,National Unified Card
+ActCfg_Name20031,Tiger King Pet Exchange
+ActCfg_Name22,Pet Exchange Issue 6
+ActCfg_Name86,Daily accumulation activities during the Dragon Boat Festival
+ActCfg_Name42,Pet Exchange Issue 8
+ActCfg_Name150,Christmas Savings Event
+ActCfg_Name204,Pet Exchange Issue 43
+ActCfg_Name15002,Exchange for Outing
+ActCfg_Name80,The King's bounty Issue 25
+ActCfg_Name11,Novice Store
+ActCfg_Name41,The King's bounty Issue 7
+ActCfg_Name19001,BT Daily Accumulated Storage
+ActCfg_Name23,Pet Exchange Issue 7
+ActCfg_Name82,The King's bounty Issue 27
+ActCfg_Name93,Daily summer accumulation activity
+ActCfg_Name10001,Accumulated RO coins
+ActCfg_Name40,The King's bounty Issue 6
+ActCfg_Name92,Summer check-in
+ActCfg_Name119,The Heavenly Weaver Girl
+ActCfg_Name308,The King's bounty Issue 49
+ActCfg_Name307,The King's bounty Issue 48
+ActCfg_Name47,The King's bounty Issue 13
+ActCfg_Name18002,Accumulated savings in early December
+ActCfg_Name117,Pet Exchange Issue 33
+ActCfg_Name94,Magic Altar
+ActCfg_Name304,The King's bounty Issue 45
+ActCfg_Name20,Pet Exchange Issue 4
+ActCfg_Name136,Double 11 Return Accumulation
+ActCfg_Name46,The King's bounty Issue 12
+ActCfg_Name18004,Lantern Festival stored value
+ActCfg_Name130,Pet Exchange Issue 38
+ActCfg_Name88,Dragon Boat Festival login
+ActCfg_Name300,The King's bounty Issue 41
+ActCfg_Name208,Pet Exchange Issue 47
+ActCfg_Name206,Pet Exchange Issue 45
+ActCfg_Name45,The King's bounty Issue 11
+ActCfg_Name18006,Daily stored value
+ActCfg_Name10,Lantern Festival Activity
+ActCfg_Name90,Summer Party
+ActCfg_Name21,Pet Exchange Issue 5
+ActCfg_Name137,Double 11 login activity
+ActCfg_Name200,Pet Exchange Issue 39
+ActCfg_Name44,The King's bounty Issue 10
+ActCfg_Name71,Pet Exchange Issue 23
+ActCfg_Name148,Unified server login
+ActCfg_Name5,New Year's Day and Christmas activities
+ActCfg_Name147,Joint service accumulation storage
+ActCfg_Name68,Pet Exchange Issue 20
+ActCfg_Name146,Holy Light Altar
+ActCfg_Name69,Pet Exchange Issue 21
+ActCfg_Name128,Pet Exchange Issue 36
+ActCfg_Name129,Pet Exchange Issue 37
+ActCfg_Name18,Pet Exchange Issue 2
+ActCfg_Name121,The King's bounty Issue 1
+ActCfg_Name144,12.12 Accumulation Activity
+ActCfg_Name67,Pet Exchange Issue 19
+ActCfg_Name142,Magic Controller
+ActCfg_Name141,The Power of Magic Sword
+ActCfg_Name134,11.11 Special Offer Accumulated Savings
+ActCfg_Name64,Lucky Wheel
+ActCfg_Name135,11.11 Special Offer Accumulated Savings
+ActCfg_Name65,Heartbeat Maid
+ActCfg_Name140,Magical Awakener
+ActCfg_Name138,Accumulated savings at the end of November
+ActCfg_Name19,Pet Exchange Issue 3
+ActCfg_Name303,The King's bounty Issue 44
+ActCfg_Name302,The King's bounty Issue 43
+ActCfg_Name301,The King's bounty Issue 42
+ActCfg_Name77,The King's bounty Issue 22
+ActCfg_Name127,Pet Exchange Issue 35
+ActCfg_Name32,Pet Exchange Issue 16
+ActCfg_Name76,The King's bounty Issue 21
+ActCfg_Name123,Accumulated savings for National Day celebration
+ActCfg_Name145,12.12 Return Event
+ActCfg_Name309,The King's bounty Issue 50
+ActCfg_Name39,The King's bounty Issue 5
+ActCfg_Name33,Pet Exchange Issue 17
+ActCfg_Name306,The King's bounty Issue 47
+ActCfg_Name305,The King's bounty Issue 46
+ActCfg_Name78,The King's bounty Issue 23
+ActCfg_Name116,Pet Exchange Issue 32
+ActCfg_Name16,Goddess Returns
+ActCfg_Name113,The King's bounty Issue 39
+ActCfg_Name38,The King's bounty Issue 4
+ActCfg_Name34,Pet Exchange Issue 18
+ActCfg_Name70,Pet Exchange Issue 22
+ActCfg_Name111,The King's bounty Issue 37
+ActCfg_Name72,Pet Exchange Issue 24
+ActCfg_Name109,The King's bounty Issue 35
+ActCfg_Name107,The King's bounty Issue 33
+ActCfg_Name105,The King's bounty Issue 31
+ActCfg_Name37,The King's bounty Issue 3
+ActCfg_Name8,New Year's Store
+ActCfg_Name74,Pet Exchange Issue 26
+ActCfg_Name17,Pet Exchange Issue 1
+ActCfg_Name99,Demon Ninja Attack
+ActCfg_Name97,Pet Exchange Issue 29
+ActCfg_Name95,Fire ninja is coming
+ActCfg_Name30,Pet Exchange Issue 14
+ActCfg_Name118,Pet Exchange Issue 34
+ActCfg_Name87,Searching for Immortals on Dragon Boat Festival
+ActCfg_Name83,The King's bounty Issue 28
+ActCfg_Name58,Tiger King Card Exchange Event
+ActCfg_Name81,The King's bounty Issue 26
+ActCfg_Name79,The King's bounty Issue 24
+ActCfg_Name75,Pet Exchange Issue 27
+ActCfg_Name73,Pet Exchange Issue 25
+ActCfg_Name112,The King's bounty Issue 38
+ActCfg_Name59,The tyrant descended
+ActCfg_Name15,Outing activities
+ActCfg_Name57,Daily Accumulation Activity for May Day
+SzhKh,設置口號111

+ 23 - 8
Assets/Content/Fonts/BattleFont/BattleFontSDF.asset

@@ -12,9 +12,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
   m_Name: BattleFontSDF
   m_EditorClassIdentifier: 
-  hashCode: 0
+  hashCode: -1261973336
   material: {fileID: 21740976602541580}
-  materialHashCode: 0
+  materialHashCode: -783580792
   m_Version: 1.1.0
   m_SourceFontFileGUID: 95bc6efacfe050e4796ee6fa5aed9c5c
   m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 95bc6efacfe050e4796ee6fa5aed9c5c,
@@ -22,10 +22,12 @@ MonoBehaviour:
   m_SourceFontFile: {fileID: 12800000, guid: 95bc6efacfe050e4796ee6fa5aed9c5c, type: 2}
   m_AtlasPopulationMode: 1
   m_FaceInfo:
+    m_FaceIndex: 0
     m_FamilyName: 
     m_StyleName: 
     m_PointSize: 0
-    m_Scale: 0
+    m_Scale: 1
+    m_UnitsPerEM: 0
     m_LineHeight: 0
     m_AscentLine: 0
     m_CapLine: 0
@@ -46,6 +48,8 @@ MonoBehaviour:
   m_AtlasTextures:
   - {fileID: 28547621596297568}
   m_AtlasTextureIndex: 0
+  m_IsMultiAtlasTexturesEnabled: 0
+  m_ClearDynamicDataOnBuild: 0
   m_UsedGlyphRects: []
   m_FreeGlyphRects:
   - m_X: 0
@@ -133,14 +137,15 @@ MonoBehaviour:
   tabSize: 10
 --- !u!21 &21740976602541580
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: BattleFont Atlas Material
   m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
-  m_ShaderKeywords: 
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -170,6 +175,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _Ambient: 0.5
     - _Bevel: 0.5
@@ -198,12 +204,13 @@ Material:
     - _OutlineWidth: 0
     - _PerspectiveFilter: 0.875
     - _Reflectivity: 10
-    - _ScaleRatioA: 1
-    - _ScaleRatioB: 1
-    - _ScaleRatioC: 1
+    - _ScaleRatioA: 0.9
+    - _ScaleRatioB: 0.73125
+    - _ScaleRatioC: 0.73125
     - _ScaleX: 1
     - _ScaleY: 1
     - _ShaderFlags: 0
+    - _Sharpness: 0
     - _SpecularPower: 2
     - _Stencil: 0
     - _StencilComp: 8
@@ -231,6 +238,7 @@ Material:
     - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
     - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_BuildTextureStacks: []
 --- !u!28 &28547621596297568
 Texture2D:
   m_ObjectHideFlags: 0
@@ -243,15 +251,20 @@ Texture2D:
     Hash: 00000000000000000000000000000000
   m_ForcedFallbackFormat: 4
   m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
   serializedVersion: 2
   m_Width: 0
   m_Height: 0
   m_CompleteImageSize: 0
+  m_MipsStripped: 0
   m_TextureFormat: 1
   m_MipCount: 1
   m_IsReadable: 1
+  m_IsPreProcessed: 0
+  m_IgnoreMasterTextureLimit: 0
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
+  m_VTOnly: 0
   m_AlphaIsTransparency: 0
   m_ImageCount: 1
   m_TextureDimension: 2
@@ -265,9 +278,11 @@ Texture2D:
     m_WrapW: 0
   m_LightmapFormat: 0
   m_ColorSpace: 0
+  m_PlatformBlob: 
   image data: 0
   _typelessdata: 
   m_StreamData:
+    serializedVersion: 2
     offset: 0
     size: 0
     path: 

Файловите разлики са ограничени, защото са твърде много
+ 10572 - 10392
Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset


+ 5 - 2
Assets/Content/Fonts/colortubeAtlasMaterial50.mat

@@ -2,14 +2,15 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: colortubeAtlasMaterial50
   m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
-  m_ShaderKeywords: 
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -40,6 +41,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _Ambient: 0.5
     - _Bevel: 0.5
@@ -102,3 +104,4 @@ Material:
     - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
     - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_BuildTextureStacks: []

Файловите разлики са ограничени, защото са твърде много
+ 895 - 123
Assets/Content/Fonts/colortubeSDF.asset


+ 14 - 0
Assets/Content/Prefabs/UI/UIBattle/BattleStatistics.prefab

@@ -3497,6 +3497,7 @@ GameObject:
   - component: {fileID: 1367627873238654636}
   - component: {fileID: 3022899158224784573}
   - component: {fileID: 8195646371946568982}
+  - component: {fileID: 3356540041611351881}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -3586,6 +3587,19 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!114 &3356540041611351881
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4661426550821355474}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: TitleBattleCount
 --- !u!1 &4805156771396702547
 GameObject:
   m_ObjectHideFlags: 0

Файловите разлики са ограничени, защото са твърде много
+ 159 - 159
Assets/Content/Prefabs/UI/UIBattle/UIQuickBattle.prefab


+ 14 - 0
Assets/Content/Prefabs/UI/UICardTips/UICardGot.prefab

@@ -1002,6 +1002,7 @@ GameObject:
   - component: {fileID: 1572691536088691782}
   - component: {fileID: 3997781265089290180}
   - component: {fileID: 3175950963615402259}
+  - component: {fileID: 7705628681841163650}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -1100,6 +1101,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.38823533, g: 0.3803922, b: 0.6784314, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &7705628681841163650
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4273468978065907038}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: Congratulation
 --- !u!1 &4460494761898581173
 GameObject:
   m_ObjectHideFlags: 0

Файловите разлики са ограничени, защото са твърде много
+ 129 - 129
Assets/Content/Prefabs/UI/UIExpedition/UIExpedition.prefab


+ 8 - 8
Assets/Content/Prefabs/UI/UIExpedition/UIExpeditionDungeonInfo.prefab

@@ -2877,9 +2877,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3302503509344282931}
   - {fileID: 8953069674332995280}
   - {fileID: 6439421310635393738}
+  - {fileID: 3302503509344282931}
   m_Father: {fileID: 5662234613141281436}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3195,11 +3195,11 @@ RectTransform:
   - {fileID: 286957995322531737}
   - {fileID: 7688175627172789437}
   m_Father: {fileID: 5949309332077365445}
-  m_RootOrder: 0
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -30, y: -40}
+  m_AnchoredPosition: {x: -30, y: -128}
   m_SizeDelta: {x: 330, y: 40}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &6597478539867124276
@@ -12532,11 +12532,11 @@ RectTransform:
   - {fileID: 6721461418537233605}
   - {fileID: 4340173158798924276}
   m_Father: {fileID: 5949309332077365445}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -30, y: -128}
+  m_AnchoredPosition: {x: -30, y: -84}
   m_SizeDelta: {x: 330, y: 44}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &4698298243726844906
@@ -12554,7 +12554,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5927324731512535272}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -13905,11 +13905,11 @@ RectTransform:
   - {fileID: 3436869727357441164}
   - {fileID: 7193747533659209568}
   m_Father: {fileID: 5949309332077365445}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -30, y: -84}
+  m_AnchoredPosition: {x: -30, y: -40}
   m_SizeDelta: {x: 330, y: 40}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &710403759935033642

Файловите разлики са ограничени, защото са твърде много
+ 141 - 103
Assets/Content/Prefabs/UI/UIExpedition/UIExpeditionRank.prefab


Файловите разлики са ограничени, защото са твърде много
+ 134 - 108
Assets/Content/Prefabs/UI/UIFashion/UIFashionLvUp.prefab


Файловите разлики са ограничени, защото са твърде много
+ 137 - 128
Assets/Content/Prefabs/UI/UIFilter/UIFilter.prefab


Файловите разлики са ограничени, защото са твърде много
+ 124 - 122
Assets/Content/Prefabs/UI/UIHundredDojo/UIHundredDojo.prefab


Файловите разлики са ограничени, защото са твърде много
+ 174 - 187
Assets/Content/Prefabs/UI/UIHundredDojo/UIHundredDojoSlogan.prefab


+ 46 - 32
Assets/Content/Prefabs/UI/UIPet/UIPetBattle.prefab

@@ -608,7 +608,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -620,9 +620,9 @@ MonoBehaviour:
   m_fontSizeMin: 3
   m_fontSizeMax: 32
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -1917,7 +1917,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -1929,9 +1929,9 @@ MonoBehaviour:
   m_fontSizeMin: 3
   m_fontSizeMax: 32
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -3646,7 +3646,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -3658,9 +3658,9 @@ MonoBehaviour:
   m_fontSizeMin: 20
   m_fontSizeMax: 48
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -3872,7 +3872,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -3884,9 +3884,9 @@ MonoBehaviour:
   m_fontSizeMin: 3
   m_fontSizeMax: 32
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -4426,6 +4426,7 @@ GameObject:
   - component: {fileID: 773544617701713794}
   - component: {fileID: 6886626711335602816}
   - component: {fileID: 2792843583570421148}
+  - component: {fileID: 1612161032002206876}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -4495,6 +4496,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7B5B\u9009"
+--- !u!114 &1612161032002206876
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2339745223461697316}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: ShaiXuan
 --- !u!1 &2432122572459504263
 GameObject:
   m_ObjectHideFlags: 0
@@ -9639,7 +9653,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -9651,9 +9665,9 @@ MonoBehaviour:
   m_fontSizeMin: 3
   m_fontSizeMax: 32
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -10562,10 +10576,10 @@ RectTransform:
   m_Father: {fileID: 1709256849339654416}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 585, y: 0}
-  m_SizeDelta: {x: 0, y: 140}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 585, y: -464.99997}
+  m_SizeDelta: {x: 304, y: 140}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &843770841736046015
 CanvasRenderer:
@@ -11353,7 +11367,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -11365,9 +11379,9 @@ MonoBehaviour:
   m_fontSizeMin: 3
   m_fontSizeMax: 32
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -12000,7 +12014,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -12012,9 +12026,9 @@ MonoBehaviour:
   m_fontSizeMin: 3
   m_fontSizeMax: 32
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0

Файловите разлики са ограничени, защото са твърде много
+ 130 - 132
Assets/Content/Prefabs/UI/UIPet/UIPetDecompose.prefab


+ 1 - 1
Assets/Editor/AssetBundle/HY_Ios_en.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   Name: HY_Ios_en
   CN_Name: "\u6D77\u5916IOS(\u82F1\u6587\u5305)"
   OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/4_en"
-  NewPath: ./StreamingAssets/AssetsAndroid
+  NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/unityRes
   OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/4_en"
   VersionFileName: afivs
   mainfestFileName: afimft

+ 2 - 1
Assets/Lua/UI/UIBattle/UIQuickBattleCtr.lua

@@ -2,6 +2,7 @@ local UIQuickBattleCtr = class("UIQuickBattleCtr", require("UICtrBase"))
 
 function UIQuickBattleCtr:Init(view)
 	self.view = view
+	self.limitStr = I18N.T('Limit')
 end
 
 function UIQuickBattleCtr:SetData(data)
@@ -28,7 +29,7 @@ end
 function UIQuickBattleCtr:GetUseCondition()
 	local leftCnt = self:LeftCnt()
 	if leftCnt == 0 then
-		return "已達上限", true
+		return self.limitStr , true
 	end
 
 	local nextTimes = ManagerContainer.LuaBattleMgr:UsedQuickBattleTimes() + 1

+ 2 - 2
Assets/Lua/UI/UIHundredDojo/UIHundredDojoView.lua

@@ -754,7 +754,7 @@ function UIHundredDojoView:RefreshAreaItemLua(areaItemLua, areaId, hideName)
 					areaItemLua.animator:Play('NormalKeep')
 				end
 				areaItemLua.nameBoard.bG.image.color = color
-				areaItemLua.nameBoard.nameTxt.text.text = (playName and tostring(playName) or '')
+				areaItemLua.nameBoard.nameTxt.text.text = (playName and I18N.T(tostring(playName)) or '')
 				areaItemLua.nameBoard.power.text.text = tostring(atkPower)
 				if hideName then
 					areaItemLua.nameBoard:SetActive(false)
@@ -1038,7 +1038,7 @@ function UIHundredDojoView:OpenMenu(areaId)
 	self.menu.panel.transform.position = areaItemLua.transform.position
 	self.menu.panel.transform:SetAsLastSibling()
 	self.menu.nameBoard.bG.image.color = color
-	self.menu.nameBoard.nameTxt.text.text = (playName and tostring(playName) or '')
+	self.menu.nameBoard.nameTxt.text.text = (playName and I18N.T(tostring(playName)) or '')
 	self.menu.nameBoard.power.text.text = tostring(atkPower)
 	self.menu.nameBoard:SetActive(true)
 	self:RefreshMenuLeftTimer()

Файловите разлики са ограничени, защото са твърде много
+ 637 - 14
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset


+ 3 - 3
ProjectSettings/ProjectSettings.asset

@@ -161,10 +161,10 @@ PlayerSettings:
   applicationIdentifier:
     Android: com.xjro.yy
     WebGL: com.wt.no.sdk.test
-    iPhone: com.ycgame.cxz.ios
+    iPhone: com.cxzusgame.ios
   buildNumber:
     Standalone: 0
-    iPhone: 0.1.0.2
+    iPhone: 0.1.0.0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 1000006
@@ -849,7 +849,7 @@ PlayerSettings:
     Android: USE_LUA;VUPLEX_CCU;FPS_DISABLE;GAME_DEBUG
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
-    iPhone: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE
+    iPhone: USE_LUA;VUPLEX_CCU
   additionalCompilerArguments: {}
   platformArchitecture:
     iPhone: 1

Някои файлове не бяха показани, защото твърде много файлове са промени