李桃 6 days ago
parent
commit
04f7cd14ad

File diff suppressed because it is too large
+ 237 - 670
Assets/Art/cs3.scene


+ 3 - 3
Assets/Res/UI/AppBarPanel/TitlePanel.prefab

@@ -72,7 +72,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: -193.1, y: 21.954}
+  m_AnchoredPosition: {x: -193.1, y: 20}
   m_SizeDelta: {x: 220.1661, y: 50.1693}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8974566408459148074
@@ -402,7 +402,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -15.9, y: 41.2}
+  m_AnchoredPosition: {x: -15.900024, y: 41.199997}
   m_SizeDelta: {x: 0, y: 56}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &7928542766183595868
@@ -648,7 +648,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1500, y: 3248}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7203008914783957009
 CanvasRenderer:

+ 18 - 6
Assets/Res/UI/LevelChoosePanel/Places/PengLaiDaoPlacesPanel.prefab

@@ -244,11 +244,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 155
+      value: -115
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -457
+      value: 560
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -262,6 +262,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2782272256760292644, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_Text
+      value: "\u5317\u6D77"
+      objectReference: {fileID: 0}
     - target: {fileID: 6200425982828528602, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_Name
       value: pllaces_1
@@ -466,11 +470,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 158
+      value: -108
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 273
+      value: -578
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -484,6 +488,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2782272256760292644, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_Text
+      value: "\u85D0\u59D1\u5C04\u5C71"
+      objectReference: {fileID: 0}
     - target: {fileID: 5214990695545658385, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: imageH
       value: 149.7444
@@ -577,11 +585,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -159
+      value: 318
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -114
+      value: -77
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -599,6 +607,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: -159
       objectReference: {fileID: 0}
+    - target: {fileID: 2782272256760292644, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_Text
+      value: "\u5C27\u90FD"
+      objectReference: {fileID: 0}
     - target: {fileID: 5214990695545658385, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: imageH
       value: 149.7444

+ 2 - 2
Assets/Res/UI/LevelChoosePanel/PlacesWidget.prefab

@@ -54,7 +54,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1667248125055319908}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -261,7 +261,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 67.5, y: 201.7}
+  m_AnchoredPosition: {x: 62, y: 187}
   m_SizeDelta: {x: 228.8132, y: 48.9831}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &2933906186252051803

+ 2 - 2
Assets/Res/UI/ShopPanel/EnergyWidget.prefab

@@ -201,9 +201,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40

+ 2 - 2
UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

BIN
美术/art_use_ui/bg/bg_map_di.png


BIN
美术/参考/地图.png


Some files were not shown because too many files changed in this diff