root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan

tcx_xiyou_yueNan
DESKTOP-MMO982B\User 2026-06-27 18:40:35 +08:00
parent 438e1eeccf 4471e741be
commit 8dbae6ec2d
10 changed files with 379 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/ManagedResources/Atlas/ArenaTopMatchAtlas/r_jingjichang_mingzidi_01.png.meta
View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 22, y: 26, z: 23, w: 17}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -91,6 +91,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

2
Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_zifu_zifumingzidi.png.meta
View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 10, y: 13, z: 11, w: 11}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1

4
Assets/ManagedResources/BG/t_tequan_henlandi.png.meta
View File

@ -47,7 +47,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 39, y: 26, z: 35, w: 29}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -115,7 +115,7 @@ TextureImporter:
width: 1080
height: 687
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []

13
Assets/ManagedResources/DynamicAtlas/r_zjm_didi.png.meta
View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 1073, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -91,6 +91,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

16
Assets/ManagedResources/Prefabs/UI/HomeLand/SpecailTrainingInfoPopup.prefab
View File

@ -1249,7 +1249,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 95.850006, y: 0}
m_AnchoredPosition: {x: 95.85, y: 0}
m_SizeDelta: {x: 83.7, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &365477818
@ -2538,7 +2538,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 748, y: -36}
m_AnchoredPosition: {x: 678, y: 92}
m_SizeDelta: {x: 290.77, y: 243.87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2373459641177728600
@ -4854,7 +4854,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: 443, y: -56}
m_AnchoredPosition: {x: 443, y: -75}
m_SizeDelta: {x: 400, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6674535296229178781
@ -6318,7 +6318,7 @@ MonoBehaviour:
m_Left: 54
m_Right: 0
m_Top: 110
m_Bottom: 0
m_Bottom: 80
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 0
@ -6821,10 +6821,10 @@ RectTransform:
m_Father: {fileID: 6674535296229178769}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 670.3, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 535.15, y: 0}
m_SizeDelta: {x: 670.3, y: 60}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6674535297518341898
CanvasRenderer:

47
Assets/ManagedResources/Prefabs/UI/HomeLand/TrainingItemListPanel.prefab
View File

@ -226,7 +226,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1, y: -611}
m_AnchoredPosition: {x: -1, y: -320}
m_SizeDelta: {x: 260, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3479209885896132788
@ -509,7 +509,7 @@ RectTransform:
m_GameObject: {fileID: 2456797696501117196}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: -1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4024122233085923020}
m_RootOrder: 0
@ -540,7 +540,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.7075472, g: 0.4953498, b: 0.08343716, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -560,10 +560,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: '11111111111111111111
'
m_Text: "\u7A7A\u7A7A\u5982\u4E5F"
LanguageIndex: 10146
--- !u!1 &3191449937460997444
GameObject:
@ -592,7 +589,7 @@ RectTransform:
m_GameObject: {fileID: 3191449937460997444}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: -1, y: 1, z: 1}
m_Children:
- {fileID: 1052705496988746962}
m_Father: {fileID: 1260889497684064707}
@ -600,7 +597,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -310, y: 127}
m_AnchoredPosition: {x: -452, y: 102}
m_SizeDelta: {x: 402, y: 234}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5954861885990124200
@ -657,7 +654,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1260889497684064707
RectTransform:
m_ObjectHideFlags: 0
@ -667,7 +664,7 @@ RectTransform:
m_GameObject: {fileID: 3788010084740827630}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_Children:
- {fileID: 4024122233085923020}
m_Father: {fileID: 6049738074903891359}
@ -675,8 +672,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 104.99994, y: 91}
m_SizeDelta: {x: 306, y: 414}
m_AnchoredPosition: {x: 149, y: -28}
m_SizeDelta: {x: 519, y: 404}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7808546774691958039
CanvasRenderer:
@ -1557,7 +1554,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 188, y: -616.7}
m_AnchoredPosition: {x: 0, y: -319}
m_SizeDelta: {x: 260, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6052243787239536521
@ -1767,8 +1764,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 619.2}
m_SizeDelta: {x: 854.3, y: 1292.3}
m_AnchoredPosition: {x: -0.39, y: 335.87}
m_SizeDelta: {x: 835.1, y: 643.44}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &6051813782008425455
CanvasRenderer:
@ -1841,7 +1838,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -85.5}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.399994, y: -132}
m_AnchoredPosition: {x: 17.400002, y: -104.5}
m_SizeDelta: {x: 32.49, y: 32.49}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6052131586510649575
@ -2082,7 +2079,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -51, y: -50}
m_AnchoredPosition: {x: -26, y: -32}
m_SizeDelta: {x: 142, y: 131}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6052479451082637443
@ -2379,7 +2376,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -868, y: 424.7}
m_AnchoredPosition: {x: -1009, y: 424.7}
m_SizeDelta: {x: 120, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6051762811617121871
@ -2397,7 +2394,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5831785950686008659}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -2657,8 +2654,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 8.37, y: 41.27}
m_SizeDelta: {x: 1032.67, y: 1513.75}
m_AnchoredPosition: {x: 0, y: 41.27}
m_SizeDelta: {x: 880, y: 900}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6051911658930329287
CanvasRenderer:
@ -2807,8 +2804,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -89, y: 21}
m_SizeDelta: {x: 6, y: 983.7}
m_AnchoredPosition: {x: -111, y: 0.33}
m_SizeDelta: {x: 6, y: 778.58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6052377417851579217
CanvasRenderer:
@ -2928,7 +2925,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 1.8000488, y: 0.5999985}
m_AnchoredPosition: {x: 1.8000488, y: 34.7}
m_SizeDelta: {x: 117.88, y: 32.19}
m_Pivot: {x: 0, y: 0}
--- !u!222 &7225143497615663008

372
Assets/ManagedResources/Prefabs/UI/RationNumber/RatioNumberLevelPanel.prefab
View File

File diff suppressed because it is too large Load Diff

4
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab
View File

@ -5515,7 +5515,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -274.65018}
m_AnchoredPosition: {x: 0, y: -313}
m_SizeDelta: {x: 197.07, y: 47.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8739293710773522863
@ -15062,7 +15062,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -264.85016}
m_AnchoredPosition: {x: 0, y: -313}
m_SizeDelta: {x: 197.07, y: 47.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8124316201421649845

6
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
View File

@ -55924,7 +55924,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u52A0\u9501"
m_Text: "\u4EE5\u9501\u5B9A"
LanguageIndex: 0
--- !u!1 &1577394767640068158
GameObject:
@ -57809,7 +57809,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u4FEE\u70BC"
m_Text: "\u795E\u89C9"
LanguageIndex: 0
--- !u!1 &4002502992977103723
GameObject:
@ -61106,7 +61106,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u89E3\u9501"
m_Text: "\u672A\u9501\u5B9A"
LanguageIndex: 0
--- !u!1 &7551254637041198217
GameObject:

4
Assets/ManagedResources/~Lua/Common/Language.lua
View File

@ -2240,7 +2240,7 @@ Language = {
[12239] = GetLanguageStrById("<color=#FE2F33>精炼大师%s级</color>"),
[12240] = GetLanguageStrById("<color=#%s>神魂%s：%s</color>"),
[12241] = GetLanguageStrById("神魂效果"),
[12242] = GetLanguageStrById("修炼"),
[12242] = GetLanguageStrById("神觉"),
[12243] = GetLanguageStrById("飞升5解锁"),
[12244] = GetLanguageStrById("飞升3解锁"),
[12245] = GetLanguageStrById("星解锁\n"),
@ -3190,7 +3190,7 @@ Language = {
[13189] = GetLanguageStrById("天赋材料"),
[13190] = GetLanguageStrById("玩家头像框"),
[13191] = GetLanguageStrById("改名卡"),
[13192] = GetLanguageStrById("霸气"),
[13192] = GetLanguageStrById("法术"),
[13193] = GetLanguageStrById("头像"),
[13194] = GetLanguageStrById("坐骑"),
[13195] = GetLanguageStrById("宝器"),