Browse Source

正式版

jet 8 năm trước cách đây
mục cha
commit
43d3639384

+ 0 - 204
Assets/New Animation.anim

@@ -1,204 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!74 &7400000
-AnimationClip:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: New Animation
-  serializedVersion: 6
-  m_Legacy: 0
-  m_Compressed: 0
-  m_UseHighQualityCurve: 1
-  m_RotationCurves: []
-  m_CompressedRotationCurves: []
-  m_EulerCurves: []
-  m_PositionCurves: []
-  m_ScaleCurves: []
-  m_FloatCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 2
-        time: 0
-        value: -337
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      - serializedVersion: 2
-        time: 1
-        value: 304
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_AnchoredPosition.x
-    path: 
-    classID: 224
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 2
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      - serializedVersion: 2
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_AnchoredPosition.y
-    path: 
-    classID: 224
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 2
-        time: 0
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-      - serializedVersion: 2
-        time: 1
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_IsActive
-    path: GameObject
-    classID: 1
-    script: {fileID: 0}
-  m_PPtrCurves: []
-  m_SampleRate: 60
-  m_WrapMode: 0
-  m_Bounds:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 0, y: 0, z: 0}
-  m_ClipBindingConstant:
-    genericBindings:
-    - path: 0
-      attribute: 1460864421
-      script: {fileID: 0}
-      classID: 224
-      customType: 0
-      isPPtrCurve: 0
-    - path: 1482111001
-      attribute: 2086281974
-      script: {fileID: 0}
-      classID: 1
-      customType: 0
-      isPPtrCurve: 0
-    - path: 0
-      attribute: 538195251
-      script: {fileID: 0}
-      classID: 224
-      customType: 0
-      isPPtrCurve: 0
-    pptrCurveMapping: []
-  m_AnimationClipSettings:
-    serializedVersion: 2
-    m_AdditiveReferencePoseClip: {fileID: 0}
-    m_AdditiveReferencePoseTime: 0
-    m_StartTime: 0
-    m_StopTime: 1
-    m_OrientationOffsetY: 0
-    m_Level: 0
-    m_CycleOffset: 0
-    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 0
-    m_LoopBlend: 0
-    m_LoopBlendOrientation: 0
-    m_LoopBlendPositionY: 0
-    m_LoopBlendPositionXZ: 0
-    m_KeepOriginalOrientation: 0
-    m_KeepOriginalPositionY: 1
-    m_KeepOriginalPositionXZ: 0
-    m_HeightFromFeet: 0
-    m_Mirror: 0
-  m_EditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 2
-        time: 0
-        value: -337
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      - serializedVersion: 2
-        time: 1
-        value: 304
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_AnchoredPosition.x
-    path: 
-    classID: 224
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 2
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      - serializedVersion: 2
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_AnchoredPosition.y
-    path: 
-    classID: 224
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 2
-        time: 0
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-      - serializedVersion: 2
-        time: 1
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_IsActive
-    path: GameObject
-    classID: 1
-    script: {fileID: 0}
-  m_EulerEditorCurves: []
-  m_HasGenericRootTransform: 0
-  m_HasMotionFloatCurves: 0
-  m_GenerateMotionCurves: 0
-  m_IsEmpty: 0
-  m_Events: []

+ 0 - 8
Assets/New Animation.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: dab8567c9ba6b3e42b5984cb4ad18228
-timeCreated: 1503041721
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 155
Assets/New Animator Controller.controller

@@ -1,155 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!91 &9100000
-AnimatorController:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: New Animator Controller
-  serializedVersion: 5
-  m_AnimatorParameters:
-  - m_Name: New Int
-    m_Type: 3
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  - m_Name: New Bool
-    m_Type: 4
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  m_AnimatorLayers:
-  - serializedVersion: 5
-    m_Name: Base Layer
-    m_StateMachine: {fileID: 1107051571173566526}
-    m_Mask: {fileID: 0}
-    m_Motions: []
-    m_Behaviours: []
-    m_BlendingMode: 0
-    m_SyncedLayerIndex: -1
-    m_DefaultWeight: 0
-    m_IKPass: 0
-    m_SyncedLayerAffectsTiming: 0
-    m_Controller: {fileID: 9100000}
---- !u!1101 &1101235491776388954
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 3
-    m_ConditionEvent: New Int
-    m_EventTreshold: 5
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102501218870935052}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.75
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101388287987893482
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: New Bool
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102224209385745586}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1102 &1102224209385745586
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: New Animation
-  m_Speed: 0.2
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101235491776388954}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: dab8567c9ba6b3e42b5984cb4ad18228, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
---- !u!1102 &1102501218870935052
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: New State
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101388287987893482}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_Motion: {fileID: 0}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
---- !u!1107 &1107051571173566526
-AnimatorStateMachine:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: Base Layer
-  m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: 1102224209385745586}
-    m_Position: {x: 276, y: 120, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 1102501218870935052}
-    m_Position: {x: 276, y: 12, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 1102501218870935052}

+ 0 - 8
Assets/New Animator Controller.controller.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: fde84801f7737e44bbc0a9829a612f93
-timeCreated: 1503041710
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -313,7 +313,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1122321127892574
 GameObject:
   m_ObjectHideFlags: 1

+ 1 - 1
Assets/Resource/XML/Config/offline_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" addtion_fml="c*0.75" coin_lmt="" time_lmt="14400" />
+  <item id="1" addtion_fml="c*0.5" coin_lmt="" time_lmt="14400" />
   <comment>
     <id>
 id

+ 8 - 8
Assets/Script/Object/Flower.cs

@@ -315,14 +315,7 @@ public class Flower : Regist, IPointerClickHandler
 
         #endregion
 
-        TweenRoot tween = FlowerIcon.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.2f, true, true, Curve.EaseOutQuad, false, true);
-
-        tween.OnForwardFinish += () =>
-        {
-            FlowerIcon.TweenBacSr();
-        };
-
-        tween = OperateBk.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.2f, true, true, Curve.EaseOutQuad, false, true);
+        TweenRoot tween = OperateBk.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.2f, true, true, Curve.EaseOutQuad, false, true);
 
         tween.OnForwardFinish += () =>
         {
@@ -462,6 +455,13 @@ public class Flower : Regist, IPointerClickHandler
 
         if (opType != OpType)
         {
+            TweenRoot tween = FlowerIcon.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.2f, true, true, Curve.EaseOutQuad, false, true);
+
+            tween.OnForwardFinish += () =>
+            {
+                FlowerIcon.TweenBacSr();
+            };
+
             OperateBk.TweenForSr();
             FlowerIcon.TweenForSr();
 

+ 66 - 66
Assets/Script/Tool/Auxiliary.cs

@@ -131,98 +131,98 @@ public class Auxiliary : Regist
     {
         #region 调试
 
-        if (Input.GetKeyDown(KeyCode.Escape))
-        {
+        //if (Input.GetKeyDown(KeyCode.Escape))
+        //{
 
-        }
+        //}
 
-        if (Input.GetKeyDown(KeyCode.Z))
-        {
-            //ManaTutorial.EnterD1();
+        //if (Input.GetKeyDown(KeyCode.Z))
+        //{
+        //    ManaTutorial.EnterD1();
 
-            ManaCenter.MiniTimer = 0;
-        }
+        //    ManaCenter.MiniTimer = 0;
+        //}
 
-        if (Input.GetKeyDown(KeyCode.X))
-        {
-            ManaMiniGame.GameTimer = 45;
+        //if (Input.GetKeyDown(KeyCode.X))
+        //{
+        //    ManaMiniGame.GameTimer = 45;
 
-            //Lottery.TempTypeList = new List<int>();
-            //Lottery.TempValueList = new List<int>();
-            //Lottery.TempLotteryList = new List<Lottery>();
+        //    Lottery.TempTypeList = new List<int>();
+        //    Lottery.TempValueList = new List<int>();
+        //    Lottery.TempLotteryList = new List<Lottery>();
 
-            //Lottery.EnterAnimation();
+        //    Lottery.EnterAnimation();
 
-            //ManaReso.Get("Bc_LotteryItem1").TweenForEuler();
-            //ManaReso.Get("Bc_LotteryItem2").TweenForEuler();
-            //ManaReso.Get("Bc_LotteryItem3").TweenForEuler();
-        }
+        //    ManaReso.Get("Bc_LotteryItem1").TweenForEuler();
+        //    ManaReso.Get("Bc_LotteryItem2").TweenForEuler();
+        //    ManaReso.Get("Bc_LotteryItem3").TweenForEuler();
+        //}
 
-        if (Input.GetKeyDown(KeyCode.C))
-        {
-            ManaMiniGame.Score = 1000;
+        //if (Input.GetKeyDown(KeyCode.C))
+        //{
+        //    ManaMiniGame.Score = 1000;
 
-            //ManaSign.SignTime = new DateTime(2007, 1, 1);
-        }
+        //    ManaSign.SignTime = new DateTime(2007, 1, 1);
+        //}
 
-        if (Input.GetKeyDown(KeyCode.M))
-        {
-            ManaReso.Get("G_Flower").SetActive(false);
+        //if (Input.GetKeyDown(KeyCode.M))
+        //{
+        //    ManaReso.Get("G_Flower").SetActive(false);
 
-            //Debug.Log(ManaGarden.Slot);
-        }
+        //    Debug.Log(ManaGarden.Slot);
+        //}
 
-        if (Input.GetKeyDown(KeyCode.N))
-        {
-            //ManaCenter.Coin = 0;
-            //ManaCenter.Diamond = 0;
+        //if (Input.GetKeyDown(KeyCode.N))
+        //{
+        //    ManaCenter.Coin = 0;
+        //    ManaCenter.Diamond = 0;
 
-            //foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
-            //{
-            //    VARIABLE.Value.Unlock = true;
-            //}
+        //    foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
+        //    {
+        //        VARIABLE.Value.Unlock = true;
+        //    }
 
-            //foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
-            //{
-            //    VARIABLE.Value.Unlock = false;
-            //}
+        //    foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
+        //    {
+        //        VARIABLE.Value.Unlock = false;
+        //    }
 
-            //ManaGarden.FlowerInfoDic.First().Value.Unlock = true;
-        }
+        //    ManaGarden.FlowerInfoDic.First().Value.Unlock = true;
+        //}
 
-        if (Input.GetKeyDown(KeyCode.B))
-        {
-            //foreach (var VARIABLE in ManaPlayer.CloseUnitDic)
-            //{
-            //    VARIABLE.Value.Unlock();
-            //}
-        }
+        //if (Input.GetKeyDown(KeyCode.B))
+        //{
+        //    foreach (var VARIABLE in ManaPlayer.CloseUnitDic)
+        //    {
+        //        VARIABLE.Value.Unlock();
+        //    }
+        //}
 
-        if (Input.GetKeyDown(KeyCode.V))
-        {
-            //ManaServer.MailReward mailReward = new ManaServer.MailReward("1", "pack", "4");
-            //ManaServer.MailReward mailReward1 = new ManaServer.MailReward("1", "close", "2");
+        //if (Input.GetKeyDown(KeyCode.V))
+        //{
+        //    ManaServer.MailReward mailReward = new ManaServer.MailReward("1", "pack", "4");
+        //    ManaServer.MailReward mailReward1 = new ManaServer.MailReward("1", "close", "2");
 
-            //ManaServer.GetMainReward(mailReward);
-            //ManaServer.GetMainReward(mailReward1);
+        //    ManaServer.GetMainReward(mailReward);
+        //    ManaServer.GetMainReward(mailReward1);
 
-            //ManaGarden.ElfTimer = 0;
+        //    ManaGarden.ElfTimer = 0;
 
-            //ManaServer.Time = new DateTime(2007,1,1);
-        }
+        //    ManaServer.Time = new DateTime(2007, 1, 1);
+        //}
 
         //if (Input.GetKeyDown(KeyCode.P))
         //{
         //    ManaData.Level += 20;
         //}
 
-        if (Input.GetKeyDown(KeyCode.O))
-        {
-            //for (int i = 0; i < ManaCenter.CoolList.Count; i++)
-            //{
-            //    ManaCenter.CoolList[i].CoolTimer = 0;
-            //}
-        }
+        //if (Input.GetKeyDown(KeyCode.O))
+        //{
+        //    for (int i = 0; i < ManaCenter.CoolList.Count; i++)
+        //    {
+        //        ManaCenter.CoolList[i].CoolTimer = 0;
+        //    }
+        //}
 
         //if (Input.GetKeyDown(KeyCode.I))
         //{

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []

+ 1 - 1
ToList.txt

@@ -1,4 +1,4 @@
-关闭调试按键和界面
+//关闭调试按键和界面
 
 先开启Service再打包