jet 8 vuotta sitten
vanhempi
commit
314d589c0d

+ 0 - 9
Assets/Editor.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 5fcd7f3618d0f154995b49930421ea1b
-folderAsset: yes
-timeCreated: 1501174341
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Plugins/metro/UWP.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: b3a793fc2ce8625488a5576817135789
-folderAsset: yes
-timeCreated: 1501174341
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Plugins/metro/WindowsPhone81.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: ea89367846fcf554188c49cca742be04
-folderAsset: yes
-timeCreated: 1501174341
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 35 - 35
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -1607,7 +1607,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224208024033058762}
   - component: {fileID: 222089779514960784}
-  - component: {fileID: 114536451113273910}
+  - component: {fileID: 114595375702870608}
   m_Layer: 5
   m_Name: C_TipLab
   m_TagString: Untagged
@@ -4938,39 +4938,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114536451113273910
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1690088151238858}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
-    m_FontSize: 20
-    m_FontStyle: 0
-    m_BestFit: 1
-    m_MinSize: 1
-    m_MaxSize: 20
-    m_Alignment: 0
-    m_AlignByGeometry: 1
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: If you find stars hanging over a flower in mini games, don't miss it!
 --- !u!114 &114537388116406590
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5454,6 +5421,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8BED\u8A00"
+--- !u!114 &114595375702870608
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1690088151238858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ebaa46003e10d4c459afb999db97c153, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!114 &114597100579211732
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8238,7 +8238,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 139.2, y: -22.3}
+  m_AnchoredPosition: {x: 139.20003, y: -22.300049}
   m_SizeDelta: {x: 235.6, y: 40.4}
   m_Pivot: {x: 0.5000001, y: 0.49999857}
 --- !u!224 &224230966601901948

+ 8 - 8
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -567,14 +567,14 @@
     <Armature1003 desc=""><![CDATA[精灵之翼]]></Armature1003>
   </DressRoom>
   <Tip>
-    <Tip1 desc=""><![CDATA[玩累了就休息一下,即使离线, 花园也有收益哟~]]></Tip1>
-    <Tip2 desc=""><![CDATA[完成小游戏可以获得新的花朵, 不要错过哦!]]></Tip2>
-    <Tip3 desc=""><![CDATA[参观别人的花园吧, 也许能有意外发现哦!]]></Tip3>
-    <Tip4 desc=""><![CDATA[精灵不但能带来更多收入, 还能为你解锁土地哦~]]></Tip4>
-    <Tip5 desc=""><![CDATA[即便什么都不买, 也可以在试衣间随意装扮你的小公主~]]></Tip5>
+    <Tip1 desc=""><![CDATA[玩累了就休息一下,即使离线,花园也有收益哟~]]></Tip1>
+    <Tip2 desc=""><![CDATA[完成小游戏可以获得新的花朵,不要错过哦!]]></Tip2>
+    <Tip3 desc=""><![CDATA[参观别人的花园吧,也许能有意外发现哦!]]></Tip3>
+    <Tip4 desc=""><![CDATA[精灵不但能带来更多收入,还能为你解锁土地哦~]]></Tip4>
+    <Tip5 desc=""><![CDATA[即便什么都不买,也可以在试衣间随意装扮你的小公主~]]></Tip5>
     <Tip6 desc=""><![CDATA[记得每天都要来游戏里领取奖励哦!]]></Tip6>
-    <Tip7 desc=""><![CDATA[目前有3个考验大脑的小游戏, 你都能玩出好成绩吗?]]></Tip7>
-    <Tip8 desc=""><![CDATA[如果你觉得游戏还不错, 请分享给你的朋友吧!还能获得奖励哦!]]></Tip8>
-    <Tip9 desc=""><![CDATA[如果发现小游戏里有一朵花被星星笼罩, 那么你有机会得到它哦~]]></Tip9>
+    <Tip7 desc=""><![CDATA[目前有3个考验大脑的小游戏,你都能玩出好成绩吗?]]></Tip7>
+    <Tip8 desc=""><![CDATA[如果你觉得游戏还不错,请分享给你的朋友吧!还能获得奖励哦!]]></Tip8>
+    <Tip9 desc=""><![CDATA[如果发现小游戏里有一朵花被星星笼罩,那么你有机会得到它哦~]]></Tip9>
   </Tip>
 </lan>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 1 - 1
Assets/Script/Manage/Initializer.cs

@@ -40,7 +40,7 @@ public class Initializer : MonoBehaviour
         }
 
         Application.targetFrameRate = 45;
-
+        
         DontDestroyOnLoad(gameObject);
 
         ManaServer.Login(ManaCenter.LoginCallbackInitial);

+ 1 - 1
Assets/Script/Manage/ManaCenter.cs

@@ -389,7 +389,7 @@ public class ManaCenter : Regist
     public static Dictionary<string, SkillRoot> SkillDic = new Dictionary<string, SkillRoot>();
 
     #endregion
-
+    
     private void Update()
     {
         LoginThread();

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -51,7 +51,7 @@ PlayerSettings:
   m_StereoRenderingPath: 0
   m_ActiveColorSpace: 0
   m_MTRendering: 1
-  m_MobileMTRendering: 0
+  m_MobileMTRendering: 1
   m_StackTraceTypes: 010000000100000001000000010000000100000001000000
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1

+ 1 - 1
ProjectSettings/QualitySettings.asset

@@ -4,7 +4,7 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 5
+  m_CurrentQuality: 2
   m_QualitySettings:
   - serializedVersion: 2
     name: Fastest

+ 7 - 3
ToDoList.txt

@@ -1,4 +1,4 @@
-修改帧率
+是否要修改帧率
 
 Facebook 新浪微博不能分享
 
@@ -7,8 +7,12 @@ QQ
 分享按钮需要打入图集
 
 
-//关闭调试按键和界面
+关闭调试模式
+
+关闭多线程渲染
+
+关闭调试按键和界面
 
 先开启Service再打包
 
-//更新版本号
+更新版本号