Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/Config/LanguageChineseConfig.json

@@ -40246,11 +40246,35 @@
     },
     {
       "ID": 10802,
-      "txt": ""
+      "txt": " "
     },
     {
       "ID": 10803,
-      "txt": ""
+      "txt": " "
+    },
+    {
+      "ID": 10804,
+      "txt": "命运峰"
+    },
+    {
+      "ID": 10805,
+      "txt": "道友"
+    },
+    {
+      "ID": 10806,
+      "txt": "礼包码"
+    },
+    {
+      "ID": 10807,
+      "txt": "设置"
+    },
+    {
+      "ID": 10808,
+      "txt": "音乐"
+    },
+    {
+      "ID": 10809,
+      "txt": "音效"
     }
   ]
 }

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 524054502728815645}
   - component: {fileID: 6906827011810667072}
   - component: {fileID: 7919150594058772639}
+  - component: {fileID: 5681338029590110928}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -80,6 +81,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9053\u53CB"
+--- !u!114 &5681338029590110928
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 12987255805666604}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10805
 --- !u!1 &241546257052017169
 GameObject:
   m_ObjectHideFlags: 0
@@ -409,6 +423,7 @@ GameObject:
   - component: {fileID: 475219414390122298}
   - component: {fileID: 5996369394632895734}
   - component: {fileID: 8740975459501369530}
+  - component: {fileID: 6399239549364580009}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -478,6 +493,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u793C\u5305\u7801"
+--- !u!114 &6399239549364580009
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 598771742048949026}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10806
 --- !u!1 &701047435480110982
 GameObject:
   m_ObjectHideFlags: 0
@@ -3656,6 +3684,7 @@ GameObject:
   - component: {fileID: 8069595544835125342}
   - component: {fileID: 2716001008184932530}
   - component: {fileID: 7940054837985008214}
+  - component: {fileID: 6712463194991410275}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -3725,6 +3754,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u547D\u8FD0\u5CF0"
+--- !u!114 &6712463194991410275
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5312784774134869399}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10804
 --- !u!1 &5360363359332015914
 GameObject:
   m_ObjectHideFlags: 0
@@ -3736,6 +3778,7 @@ GameObject:
   - component: {fileID: 2388168768618558929}
   - component: {fileID: 6464769015660926329}
   - component: {fileID: 9195218775154034334}
+  - component: {fileID: 2558255099895709111}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -3805,6 +3848,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8BBE\u7F6E"
+--- !u!114 &2558255099895709111
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5360363359332015914}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10807
 --- !u!1 &5684881489798605106
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/SettingPanel/SettingPanel.prefab

@@ -190,6 +190,7 @@ GameObject:
   - component: {fileID: 1336933346209753520}
   - component: {fileID: 7915566129711929088}
   - component: {fileID: 1950754695086212799}
+  - component: {fileID: 6806393073505273313}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -274,6 +275,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.4198112, g: 0.31755278, b: 0.17030072, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &6806393073505273313
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6791344915447867474}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10807
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0
@@ -607,7 +621,10 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 9180982404405909350, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 5753050095550805959}
   m_SourcePrefab: {fileID: 100100000, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
 --- !u!114 &6314997753196416718 stripped
 MonoBehaviour:
@@ -620,6 +637,24 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &7304810598491070756 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 9180982404405909350, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
+  m_PrefabInstance: {fileID: 1888838191946430018}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5753050095550805959
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7304810598491070756}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10809
 --- !u!224 &7755063153901822474 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8190082389412779080, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
@@ -739,13 +774,34 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 9180982404405909350, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 5729893843871887627}
   m_SourcePrefab: {fileID: 100100000, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
 --- !u!224 &105685565816049142 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8190082389412779080, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
   m_PrefabInstance: {fileID: 8133075399362714046}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1132402584129261272 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 9180982404405909350, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}
+  m_PrefabInstance: {fileID: 8133075399362714046}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5729893843871887627
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1132402584129261272}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10808
 --- !u!114 &1627876562902720563 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7370455147177818509, guid: 26fedd89aec1dbe4ebd42196b3982338, type: 3}