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

onepiece_demo_arena
wangzhenxing 2024-01-25 15:01:54 +08:00
commit 546a878093
1 changed files with 2 additions and 2 deletions

View File

@ -874,7 +874,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u796D\u54C1\u795E\u5C06\u9009\u62E9" m_Text: "\u796D\u54C1\u82F1\u96C4\u9009\u62E9"
LanguageIndex: 0 LanguageIndex: 0
--- !u!114 &1230078845416776337 --- !u!114 &1230078845416776337
MonoBehaviour: MonoBehaviour:
@ -4151,7 +4151,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u65E0\u7B26\u5408\u8981\u6C42\u7684\u795E\u5C06\uFF01" m_Text: "\u65E0\u7B26\u5408\u8981\u6C42\u7684\u82F1\u96C4\uFF01"
LanguageIndex: 10146 LanguageIndex: 10146
--- !u!1 &7908384725362031421 --- !u!1 &7908384725362031421
GameObject: GameObject: