合并后错误修改

Assets/Resources/UI/Control/PfUIPageButton.prefab

@@ -214,7 +214,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 56ffaecccce0ae34fa083c91bcabecdb, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0

Assets/Resources/UI/Prefab/Panel/GameRoomCountDown.prefab

@@ -66,7 +66,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 56ffaecccce0ae34fa083c91bcabecdb, type: 3}
+    m_Font: {fileID: 12800000, guid: f878f11ea5771c548ac255f4e39b8e4b, type: 3}
     m_FontSize: 96
     m_FontStyle: 0
     m_BestFit: 0

Assets/Resources/UI/Prefab/Panel/HomePanel.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8bb6a9e5107a46744ba70fc370774184
+guid: 36bfda55f1b326a4d9f58750c891c4a9
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Resources/UI/Prefab/Panel/NewHomePanel.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 332fcc2a652bb8f48acfcf2d88ab2f20
+guid: 8bb6a9e5107a46744ba70fc370774184
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Resources/UI/Prefab/Panel/NewHomePanelback.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 332fcc2a652bb8f48acfcf2d88ab2f20
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/direction.txt

@@ -1,37 +1,51 @@
-10:10,-5,0,-,-,-
-243:-15,10,0,-,-,-
-750:5,-5,1,-,-,-
-849:30,-10,2,-,-,-
-1055:15,-15,1,-,-,-
-1100:10,0,0,-,-,-
-1220:10,5,0,-,-,-
-1330:-10,5,0,-,-,-
-1899:5,-5,1,-,-,-
-1925:10,-5,1,-,-,-
-2524:-5,5,1,-,-,-
-2960:10,-5,1,-,-,-
-3120:15,-5,0,-,-,-
-3300:5,5,0,-,-,-
-3555:-10,5,0,-,-,-
-3967:-10,5,1,-,-,-
-4483:10,-5,1,-,-,-
-4590:15,-5,1,-,-,-
-4817:-5,0,1,-,-,-
-5191:5,0,1,-,-,-
-5279:10,0,1,-,-,-
-5630:-10,0,0,-,-,-
-6578:5,-5,0,-,-,-
-7838:5,-5,1,-,-,-
-7919:15,0,1,-,-,-
-8471:10,0,1,-,-,-
-9536:-5,0,0,-,-,-
-9605:-10,0,0,-,-,-
-10123:5,0,0,-,-,-
-10500:-5,0,0,-,-,-
-10807:5,0,0,-,-,-
-10834:15,-5,1,-,-,-
-11033:5,-5,1,-,-,-
-11400:5,-5,1,-,-,-
-11528:5,0,1,-,-,-
-11734:-5,0,0,-,-,-
-12170:-25,5,0,-,-,-
+113:16.4,0,0,-1,3,45
+268:-2.8,0,0.7550681,-1,4.069226,45
+298:-17.2,6.1,0.4818666,-1,4.246056,45
+372:-28,5.6,-0.4048006,-1,3.479697,45
+429:-24,5.6,-0.9346578,-1,5.473352,45
+547:-21.2,5.6,-0.2429728,-1,3.972845,45
+611:-12.4,1.1,-0.32109,-1,4.237999,45
+749:1.8,1.1,0.7453919,-1,3.78505,45
+817:7,1.1,1.333951,-1,3.931795,45
+864:21,-5.1,1.333951,-1,3.931795,45
+898:32.2,-11.6,2.157078,-1,3.931795,45
+1044:30.2,-11.6,2.88893,-1,3.598711,45
+1093:22.8,-2.3,2.180352,-1,3.786387,45
+1135:18.4,0.5,2.315585,-1,4.375738,45
+1264:8.6,5.7,1.755207,-1,3.704368,45
+1344:-6.2,0,0.9801137,-1,3.537684,45
+1547:-22.6,6.1,0.8330526,-1,3.407704,45
+1714:-19.4,5.2,0.6406997,-1,3.9143,45
+1843:-7.2,-2,0.9479414,-1,4.46124,45
+1948:9,-2,1.416687,-1,4.631541,45
+2349:5.6,1.4,1.416687,-1,4.631541,45
+2463:-7.6,6.7,1.182605,-1,3.425815,45
+2640:-7.6,6.7,0.5427184,-1,3.291988,45
+2959:5.2,-0.8,0.5427184,-1,3.291988,45
+3045:14.2,0,0.7456276,-1,3.291988,45
+3324:3.6,0,0.7773573,-1,3.291988,45
+3519:-1.6,0,0.422653,-1,4.233258,45
+3634:-14.6,0,-0.4799475,-1,4.233258,45
+3777:-4.8,0,0.09549108,-1,4.030807,45
+3866:0,0,0,-1,3,45
+4013:-15.6,0,0.09549108,-1,4.030807,45
+4329:-7,0,0.3505953,-1,4.030807,45
+4435:0,0,0.7336217,-1,3,45
+4545:15,-6.4,0.979607,-1,3.860944,45
+4645:25,-5.9,1.752236,-1,3.860944,45
+4817:8.8,2.5,1.175218,-1,3.860944,45
+5008:-10.2,0,-0.082,-1,3.861,45
+5142:-0.4,0,0.253,-1,4.01,45
+5232:9.6,0,0.606,-1,3,45
+5303:19.6,0.9,1.166,-1,3.345,45
+5596:2.2,0,0.606,-1,3,45
+5641:-4.8,5.3,0.605,-1,3.172,45
+6252:-4.8,-1.6,0.605,-1,3.172,45
+6606:2.2,-0.9,0.707,-1,3.172,45
+6875:6.2,-3.5,0.707,-1,3.172,45
+7276:7.8,-3.9,1.409,-1,4.114,45
+7662:-5,2.5,0.677,-1,4.114,45
+7859:9.4,0,0.677,-1,4.114,45
+7927:14.6,0,1.215,-1,3,45
+8070:7.8,5,1.215,-1,3,45
+9037:-5,5,0.519,-1,3,45

Assets/Resources/UI/language.json

@@ -365,7 +365,7 @@
     "Please enter an integer between 0-59.": "请输入一个0-59的整数！",
     "Please check the network status!": "请检查网络连接是否正常!",
     "FINISH": "终点",
-    "Continue the game?": "有中断的划船记录，是否继续?"
+    "Continue the game?": "有中断的划船记录，是否继续?",
     "Week": "周",
     "You're watching": "你正在观看",
     "Bicycle": "自行车",
@@ -735,7 +735,7 @@
     "Please enter an integer between 0-59.": "Please enter an integer between 0-59.",
     "Please check the network status!": "Please check if the network connection is normal!",
     "FINISH": "FINISH",
-    "Continue the game?": "Continue the game?"
+    "Continue the game?": "Continue the game?",
     "Week": "Week",
     "You're watching": "You're watching",
     "Bicycle": "Bicycle",