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

onepiece_demo_arena
xiejun 2024-01-22 14:35:50 +08:00
commit 3362e3f69f
2 changed files with 17 additions and 17 deletions

View File

@ -302,7 +302,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: 116.3, y: 43.1}
m_AnchoredPosition: {x: 111.1, y: 34.7}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8855961770759762655
@ -1008,7 +1008,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 42
m_FontSize: 40
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 3
@ -1019,7 +1019,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 2
m_Text: 2000
--- !u!1 &1106207185316048076
GameObject:
m_ObjectHideFlags: 0
@ -8535,7 +8535,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_Spacing: -10
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
@ -9315,7 +9315,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_Spacing: -10
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
@ -9368,7 +9368,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: 145, y: 40}
m_AnchoredPosition: {x: 126.1, y: 37.7}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8061325059502665473
@ -10385,7 +10385,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 42
m_FontSize: 40
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 3
@ -11221,7 +11221,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 42
m_FontSize: 40
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 3
@ -16153,7 +16153,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 42
m_FontSize: 40
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 3

View File

@ -1590,14 +1590,14 @@ Language = {
[11589] = GetLanguageStrById("每次普通召唤获得1点仙缘积分\n每次友情召唤获得2点仙缘积分\n每次英雄召唤获得20点仙缘积分"),
[11590] = GetLanguageStrById("需要充值"),
[11591] = GetLanguageStrById("以上才可打开"),
[11592] = GetLanguageStrById("确认花费%s妖晶进行1次英雄召唤"),
[11593] = GetLanguageStrById("确认花费%s妖晶进行10次英雄召唤"),
[11594] = GetLanguageStrById("确认花费%s妖晶进行1次圣器召唤"),
[11595] = GetLanguageStrById("确认花费%s妖晶进行10次圣器召唤"),
[11596] = GetLanguageStrById("确认花费%s妖晶进行1次限时召唤"),
[11597] = GetLanguageStrById("确认花费%s妖晶进行10次限时召唤"),
[11598] = GetLanguageStrById("确认花费%s妖晶抽取1次乾坤宝盒"),
[11599] = GetLanguageStrById("确认花费%s妖晶抽取10次乾坤宝盒"),
[11592] = GetLanguageStrById("确认花费%s钻石进行1次英雄召唤"),
[11593] = GetLanguageStrById("确认花费%s钻石进行10次英雄召唤"),
[11594] = GetLanguageStrById("确认花费%s钻石进行1次圣器召唤"),
[11595] = GetLanguageStrById("确认花费%s钻石进行10次圣器召唤"),
[11596] = GetLanguageStrById("确认花费%s钻石进行1次限时召唤"),
[11597] = GetLanguageStrById("确认花费%s钻石进行10次限时召唤"),
[11598] = GetLanguageStrById("确认花费%s钻石抽取1次乾坤宝盒"),
[11599] = GetLanguageStrById("确认花费%s钻石抽取10次乾坤宝盒"),
[11600] = GetLanguageStrById("包含4星或更高星级的英雄"),
[11601] = GetLanguageStrById("确认送神"),
[11602] = GetLanguageStrById("退役英雄会获得仙缘余尘,若英雄已升级,突破或进阶,还会返还%s%s消耗的金币、成长护符和九转金丹是否确定退役所选英雄\n\n\t\t\t\t\t\t\t送神后获得:"),