Sfoglia il codice sorgente

细化货币单位

LiuQilin 8 anni fa
parent
commit
2f2adc608b

+ 0 - 9
Assets/Advertisements/Editor/Resources/Android/builds.meta

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

+ 0 - 9
Assets/Advertisements/Editor/Resources/iOS/builds.meta

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

+ 0 - 9
Assets/Plugins/Android/libs.meta

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

+ 0 - 9
Assets/Plugins/Android/res.meta

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

+ 0 - 9
Assets/Plugins/UnityPurchasing/Bin/Security.meta

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

+ 3 - 369
Assets/Resource/Logo.unity

@@ -91,161 +91,6 @@ NavMeshSettings:
     cellSize: 0.16666666
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &111254929
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 111254932}
-  - component: {fileID: 111254931}
-  - component: {fileID: 111254930}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &111254930
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 111254929}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &111254931
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 111254929}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 5
---- !u!4 &111254932
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 111254929}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &446804176
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 446804180}
-  - component: {fileID: 446804179}
-  - component: {fileID: 446804178}
-  - component: {fileID: 446804177}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &446804177
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 446804176}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &446804178
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 446804176}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
---- !u!223 &446804179
-Canvas:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 446804176}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!224 &446804180
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 446804176}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 1203844650}
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
 --- !u!1 &465425181
 GameObject:
   m_ObjectHideFlags: 0
@@ -310,80 +155,6 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
---- !u!1 &1203844649
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 1203844650}
-  - component: {fileID: 1203844652}
-  - component: {fileID: 1203844651}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1203844650
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1203844649}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 446804180}
-  m_RootOrder: 0
-  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: 83.5, y: -25.173904}
-  m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1203844651
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1203844649}
-  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: 1, g: 1, b: 1, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: New Text
---- !u!222 &1203844652
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1203844649}
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -402,7 +173,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!81 &1218118078
 AudioListener:
   m_ObjectHideFlags: 0
@@ -489,7 +260,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!95 &1511433817
 Animator:
   serializedVersion: 3
@@ -647,56 +418,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &1766453788
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 1766453789}
-  - component: {fileID: 1766453790}
-  m_Layer: 0
-  m_Name: GameObject
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1766453789
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1766453788}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 548.2393, y: 251.82611, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1766453790
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1766453788}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3cac44ec7ca55734c9dd55ba09a4b72a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  RegistLock: 0
-  String1: 
-  String2: 
-  TextAsset: {fileID: 0}
-  Texture: {fileID: 0}
-  Font: {fileID: 0}
-  Go: {fileID: 0}
-  GoList: []
-  SrList: []
-  Text: {fileID: 1203844651}
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0
@@ -712,7 +433,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 4294967295
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &1833966244
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -740,90 +461,3 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2099706019
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 2099706024}
-  - component: {fileID: 2099706023}
-  - component: {fileID: 2099706022}
-  - component: {fileID: 2099706021}
-  - component: {fileID: 2099706020}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!81 &2099706020
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 2099706019}
-  m_Enabled: 1
---- !u!92 &2099706021
-Behaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 2099706019}
-  m_Enabled: 1
---- !u!124 &2099706022
-Behaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 2099706019}
-  m_Enabled: 1
---- !u!20 &2099706023
-Camera:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 2099706019}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
-  m_StereoMirrorMode: 0
---- !u!4 &2099706024
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 2099706019}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 548.2393, y: 251.82611, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

BIN
Assets/Resource/Prefab/Object/Flower.prefab


BIN
Assets/Resource/Prefab/PrefabUI/CloseItem.prefab


BIN
Assets/Resource/Prefab/PrefabUI/GroupE.prefab


+ 13 - 23
Assets/Script/Tool/Auxiliary.cs

@@ -122,23 +122,13 @@ public class Auxiliary : Regist
         //gameObject.AddComponent<ManaAnim>().RegistImmed();
     }
 
-    public Text Text;
-    private double testDouble;
     private void Update()
     {
-        //ManaLan.CurrentLan = Lan.ChineseSimplified;
-
-        //testDouble = Amount.千京 + Amount.京*10;
-
-        //Text.text = ShrinkNumberStr(testDouble,2);
-
         #region 调试
 
         if (Input.GetKeyDown(KeyCode.Escape))
         {
-            ManaCenter.Coin = 15400;
-
-            ManaCenter.Pay("",15600,Current.Coin, ()=> {Debug.Log("Done");});
+            
         }
 
         if (Input.GetKeyDown(KeyCode.N))
@@ -674,9 +664,9 @@ public class Auxiliary : Regist
             }
             else
             {
-                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
+                string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
 
-                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.兆;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.兆;
             }
         }
         else if (ManaLan.CurrentLan == Lan.ChineseSimplified || ManaLan.CurrentLan == Lan.ChineseTraditional)
@@ -689,61 +679,61 @@ public class Auxiliary : Regist
             {
                 string str = (value / Amount.万).ToString("F" + (accuracy + 1));
 
-                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
             }
             else if (value < Amount.亿)
             {
                 string str = (value / Amount.千万).ToString("F" + (accuracy + 1));
 
-                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.千万;
             }
             else if (value < Amount.千亿)
             {
                 string str = (value / Amount.亿).ToString("F" + (accuracy + 1));
 
-                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.亿;
             }
             else if (value < Amount.兆)
             {
                 string str = (value / Amount.千亿).ToString("F" + (accuracy + 1));
 
-                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.千亿;
             }
             else if (value < Amount.千兆)
             {
                 string str = (value / Amount.兆).ToString("F" + (accuracy + 1));
 
-                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
             }
             else if (value < Amount.京)
             {
                 string str = (value / Amount.千兆).ToString("F" + (accuracy + 1));
 
-                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.千兆;
             }
             else if (value < Amount.千京)
             {
                 string str = (value / Amount.京).ToString("F" + (accuracy + 1));
 
-                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
             }
             else if (new BigInteger(value.ToString("0")) < Amount.垓)
             {
                 string str = (value / Amount.千京).ToString("F" + (accuracy + 1));
 
-                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.;
+                return double.Parse(OmitNumberStr(accuracy, str)) * Amount.千京;
             }
             else if (new BigInteger(value.ToString("0")) < Amount.千垓)
             {
                 string str = (new BigInteger(value.ToString("0")) / Amount.垓).ToString();
 
-                return OmitNumberStr(0, str) + "垓";
+                return double.Parse(OmitNumberStr(0, str)) * Amount.千京 * 10;
             }
             else
             {
                 string str = (new BigInteger(value.ToString("0")) / Amount.千垓).ToString();
 
-                return OmitNumberStr(0, str) + "千垓";
+                return double.Parse(OmitNumberStr(0, str)) * Amount.千京 * 10000;
             }
         }
         else

+ 1 - 9
ToList.txt

@@ -1,6 +1,3 @@
-使用ShrinkNum
-
-
 还原PlayerConfig
 
 关闭调试界面
@@ -20,9 +17,4 @@
 //更新版本号
 
 
-分享appid申请
-
-RichText
-{
-  自己写一个横向的BestFit
-}
+分享appid申请