Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -554,7 +554,7 @@ MonoBehaviour:
   m_MinValue: 0
   m_MaxValue: 1
   m_WholeNumbers: 0
-  m_Value: 0.586
+  m_Value: 1
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -1625,6 +1625,95 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5178337109298210062
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4783811371988609345}
+  - component: {fileID: 8473637489565543118}
+  - component: {fileID: 1610471767032592609}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4783811371988609345
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5178337109298210062}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1726895945858615044}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 115.1, y: 0}
+  m_SizeDelta: {x: 115, y: 33}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8473637489565543118
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5178337109298210062}
+  m_CullTransparentMesh: 1
+--- !u!114 &1610471767032592609
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5178337109298210062}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.3254902, g: 0.5882353, b: 0.59607846, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_jianbian_tiao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: a390acfcad8b75dd7afc70ae71517080
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5439861124006239330
 GameObject:
   m_ObjectHideFlags: 0
@@ -2249,6 +2338,9 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 1580400328808382700}
+  - component: {fileID: 1109337118394614720}
+  - component: {fileID: 176999352311347320}
+  - component: {fileID: 8287224943398398917}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Fill Area
@@ -2274,9 +2366,60 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.23130035}
-  m_SizeDelta: {x: 0, y: -5.0887}
+  m_AnchoredPosition: {x: -0.02859497, y: -0.13669968}
+  m_SizeDelta: {x: -3.2373, y: -2.6275}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1109337118394614720
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6664583686101087493}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!222 &176999352311347320
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6664583686101087493}
+  m_CullTransparentMesh: 1
+--- !u!114 &8287224943398398917
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6664583686101087493}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &6866735752441749542
 GameObject:
   m_ObjectHideFlags: 0
@@ -3276,13 +3419,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: -1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 4783811371988609345}
   m_Father: {fileID: 1580400328808382700}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -1.6982117, y: 0}
-  m_SizeDelta: {x: -3.3964, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2141042892668525134
 CanvasRenderer:
@@ -3313,11 +3457,11 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 3
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 0
-  m_FillAmount: 0.586
+  m_FillAmount: 0.383
   m_FillClockwise: 1
   m_FillOrigin: 1
   m_UseSpriteMesh: 0

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -138,6 +138,8 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// 领取挂机每日掉落时间
         /// </summary>
         public long QiankundaiLingQuDailyDropTime;
+
+        public long ExitTime;
     }
 
     

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -86,6 +86,7 @@ public class PlayerManager : Singleton<PlayerManager>
             }
         }
 
+        CalculateOfflineRewards();
         AccountFileInfo.Instance.SavePlayerData();
     }
 
@@ -330,70 +331,7 @@ public class PlayerManager : Singleton<PlayerManager>
             if (AccountFileInfo.Instance.playerData.QiankundaiDropTimer <= gameConstantConfig.qiankundaiMaxTime)
             {
                 AccountFileInfo.Instance.playerData.QiankundaiDropTimer++;
-                foreach (var playerDataQiankundaiData in AccountFileInfo.Instance.playerData.QiankundaiDatas)
-                {
-                    //重置掉落次数
-                    QiankundaiConfig qiankundaiConfig =
-                        ConfigComponent.Instance.Get<QiankundaiConfig>(playerDataQiankundaiData.id);
-                    if (qiankundaiConfig.dropType != 2 &&
-                        TimeHelper.ClientNow() >= playerDataQiankundaiData.refenceTime)
-                    {
-                        if (qiankundaiConfig.dropPara1 == 1)
-                        {
-                            playerDataQiankundaiData.refenceTime = TimeHelper.ClientNow() + 60 * 60 * 1000;
-                        }
-                        else if (qiankundaiConfig.dropPara1 == 2)
-                        {
-                            playerDataQiankundaiData.refenceTime =
-                                TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
-                        }
-                        else if (qiankundaiConfig.dropPara1 == 3)
-                        {
-                        }
-
-                        playerDataQiankundaiData.dropCount = 0;
-                    }
-
-
-                    if (myHero.powerUpConfig.ID >= qiankundaiConfig.dropLevel[0] &&
-                        myHero.powerUpConfig.ID <= qiankundaiConfig.dropLevel[1])
-                    {
-                        if (playerDataQiankundaiData.dropCount < qiankundaiConfig.dropPara2 ||
-                            qiankundaiConfig.dropPara2 == -1)
-                        {
-                            playerDataQiankundaiData.dropTime++;
-                            if (playerDataQiankundaiData.dropTime >= qiankundaiConfig.dropTypePara)
-                            {
-                                //发放奖励
-                                for (var i = 0; i < qiankundaiConfig.ChoukaID.Length; i++)
-                                {
-                                    List<ItemInfo> itemInfos = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
-                                        qiankundaiConfig.DropCount[i]);
-                                    foreach (var itemInfo in itemInfos)
-                                    {
-                                        AccountFileInfo.ItemData itemData =
-                                            AccountFileInfo.Instance.playerData.QiankundaiItemDatas.FirstOrDefault(i =>
-                                                i.itemId == itemInfo.itemID);
-                                        if (itemData != null)
-                                        {
-                                            itemData.itemCount += itemInfo.count.Value;
-                                        }
-                                        else
-                                        {
-                                            itemData = itemInfo.ToItemData();
-                                            AccountFileInfo.Instance.playerData.QiankundaiItemDatas.Add(itemData);
-                                        }
-                                    }
-                                }
-
-                                playerDataQiankundaiData.dropCount = 0;
-                                playerDataQiankundaiData.dropTime = 0;
-                            }
-                        }
-                    }
-
-                    AccountFileInfo.Instance.SavePlayerData();
-                }
+                QianKunDaiAward();
             }
         }
 
@@ -467,6 +405,88 @@ public class PlayerManager : Singleton<PlayerManager>
         }
     }
 
+    public void QianKunDaiAward()
+    {
+        foreach (var playerDataQiankundaiData in AccountFileInfo.Instance.playerData.QiankundaiDatas)
+        {
+            //重置掉落次数
+            QiankundaiConfig qiankundaiConfig =
+                ConfigComponent.Instance.Get<QiankundaiConfig>(playerDataQiankundaiData.id);
+            if (qiankundaiConfig.dropType != 2 &&
+                TimeHelper.ClientNow() >= playerDataQiankundaiData.refenceTime)
+            {
+                if (qiankundaiConfig.dropPara1 == 1)
+                {
+                    playerDataQiankundaiData.refenceTime = TimeHelper.ClientNow() + 60 * 60 * 1000;
+                }
+                else if (qiankundaiConfig.dropPara1 == 2)
+                {
+                    playerDataQiankundaiData.refenceTime =
+                        TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
+                }
+                else if (qiankundaiConfig.dropPara1 == 3)
+                {
+                }
+
+                playerDataQiankundaiData.dropCount = 0;
+            }
+
+
+            if (myHero.powerUpConfig.ID >= qiankundaiConfig.dropLevel[0] &&
+                myHero.powerUpConfig.ID <= qiankundaiConfig.dropLevel[1])
+            {
+                if (playerDataQiankundaiData.dropCount < qiankundaiConfig.dropPara2 ||
+                    qiankundaiConfig.dropPara2 == -1)
+                {
+                    playerDataQiankundaiData.dropTime++;
+                    if (playerDataQiankundaiData.dropTime >= qiankundaiConfig.dropTypePara)
+                    {
+                        //发放奖励
+                        for (var i = 0; i < qiankundaiConfig.ChoukaID.Length; i++)
+                        {
+                            List<ItemInfo> itemInfos = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
+                                qiankundaiConfig.DropCount[i]);
+                            foreach (var itemInfo in itemInfos)
+                            {
+                                AccountFileInfo.ItemData itemData =
+                                    AccountFileInfo.Instance.playerData.QiankundaiItemDatas.FirstOrDefault(i =>
+                                        i.itemId == itemInfo.itemID);
+                                if (itemData != null)
+                                {
+                                    itemData.itemCount += itemInfo.count.Value;
+                                }
+                                else
+                                {
+                                    itemData = itemInfo.ToItemData();
+                                    AccountFileInfo.Instance.playerData.QiankundaiItemDatas.Add(itemData);
+                                }
+                            }
+                        }
+
+                        playerDataQiankundaiData.dropCount = 0;
+                        playerDataQiankundaiData.dropTime = 0;
+                    }
+                }
+            }
+
+            AccountFileInfo.Instance.SavePlayerData();
+        }
+    }
+
+    public void CalculateOfflineRewards()
+    {
+        if (AccountFileInfo.Instance.playerData.QiankundaiDropTimer <= PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime &&  AccountFileInfo.Instance.playerData.ExitTime > 0)
+        {
+            int miao = (int)((TimeHelper.ClientNow() - AccountFileInfo.Instance.playerData.ExitTime) / 1000);
+            miao = AccountFileInfo.Instance.playerData.QiankundaiDropTimer + miao >= PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime ? PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime - miao : miao;
+            AccountFileInfo.Instance.playerData.QiankundaiDropTimer += miao;
+            PlayerManager.Instance.QianKunDaiAward();
+        }
+
+        AccountFileInfo.Instance.playerData.ExitTime = 0;
+         AccountFileInfo.Instance.SavePlayerData();
+    }
+
 
     public void AddTestHeroInfo(TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig)
     {

Assets/Scripts/GameUI/GameApplctionMono.cs

@@ -1,3 +1,4 @@
+using System;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -19,7 +20,7 @@ namespace GameUI
             // }
 #endif
 
-         
+
             EventSystem.Instance.Update();
             AssetBundleLoadManager.Instance.UpdateBundle();
             TimeHelper.clientFrame = TimeHelper.ClientFrame() + (long)(Time.deltaTime * 1000);
@@ -34,9 +35,9 @@ namespace GameUI
             {
                 this.exp += e;
                 HeroPowerUpConfig allPowerUp = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level);
-                while (exp>allPowerUp.levelUpExp&&allPowerUp.levelUpExp>0)
+                while (exp > allPowerUp.levelUpExp && allPowerUp.levelUpExp > 0)
                 {
-                    exp=exp-allPowerUp.levelUpExp;
+                    exp = exp - allPowerUp.levelUpExp;
                     level++;
                     allPowerUp = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level);
                 }
@@ -60,6 +61,21 @@ namespace GameUI
         //     Debug.Log(m);
         // }
 
+        
+
+        private async void OnApplicationPause(bool pauseStatus)
+        {
+            if (pauseStatus)
+            {
+                // 退出时记录时间
+                AccountFileInfo.Instance.playerData.ExitTime = TimeHelper.ClientNow();
+                AccountFileInfo.Instance.SavePlayerData();
+            }
+            else
+            {
+                PlayerManager.Instance.CalculateOfflineRewards();
+            }
+        }
         public void LateUpdate()
         {
             EventSystem.Instance.LateUpdate();