5530 【前端】【1.4】高级守护合成 ,合成后的守护剩余时间以服务端通知的时间为准。

client_Wu Xijin

2018-12-30 1b199fd725a8dec007ee445df16f1a3e919802a1

5530 【前端】【1.4】高级守护合成 ,合成后的守护剩余时间以服务端通知的时间为准。

 Lua/Gen/SnxxzUIItemUseModelWrap.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 623f0677ac1751b4a868485897ebfe08
timeCreated: 1545203730
timeCreated: 1546151304
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Lua/Gen/SnxxzUIKnapsackTimeCDMgrWrap.cs

@@ -104,14 +104,13 @@
                    
                    return 0;
                }
                if(gen_param_count == 5&& (LuaAPI.lua_isnil(L, 2) || LuaAPI.lua_type(L, 2) == LuaTypes.LUA_TSTRING)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 3)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 4)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 5)) 
                if(gen_param_count == 4&& (LuaAPI.lua_isnil(L, 2) || LuaAPI.lua_type(L, 2) == LuaTypes.LUA_TSTRING)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 3)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 4)) 
                {
                    string _guid = LuaAPI.lua_tostring(L, 2);
                    int _itemId = LuaAPI.xlua_tointeger(L, 3);
                    double _cdTime = LuaAPI.lua_tonumber(L, 4);
                    int _serverSurplusTime = LuaAPI.xlua_tointeger(L, 5);
                    
                    gen_to_be_invoked.Register( _guid, _itemId, _cdTime, _serverSurplusTime );
                    gen_to_be_invoked.Register( _guid, _itemId, _cdTime );
                    
                    
                    

 Lua/Gen/SnxxzUIKnapsackTimeCDMgrWrap.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 642127ab104febd4193bdbc5ceea06fa
timeCreated: 1546147185
timeCreated: 1546151304
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Lua/Gen/XLuaGenAutoRegister.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 11479d6613f53454b9f092ed34c058f8
timeCreated: 1546147185
timeCreated: 1546151304
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/KnapSack/BetterItemGetBehaviour.cs

@@ -79,7 +79,7 @@
                    var coolData = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.currentEquipGuid);

                    if (model.CheckIsAutoEquip(betterEquip) && coolData == null)

                    {

                        KnapsackTimeCDMgr.Instance.Register(betterEquip.itemInfo.ItemGUID, betterEquip.itemId, model.autoEquipCoolTime,0);

                        KnapsackTimeCDMgr.Instance.Register(betterEquip.itemInfo.ItemGUID, betterEquip.itemId, model.autoEquipCoolTime);

                    }

                }

            }


 System/KnapSack/KnapsackTimeCDMgr.cs

@@ -97,16 +97,16 @@


        }



        public void Register(string guid, int itemId,  double cdTime,int serverSurplusTime)

        public void Register(string guid, int itemId,  double cdTime)

        {

            int index;

            if (ContainsItemCD(guid, out index))

            {

                itemCDList[index].SetTime(serverSurplusTime>0? serverSurplusTime: cdTime);

                itemCDList[index].SetTime(cdTime);

            }

            else

            {

                ItemCDCool cool = new ItemCDCool(guid, itemId, serverSurplusTime > 0 ? serverSurplusTime : cdTime);

                ItemCDCool cool = new ItemCDCool(guid, itemId, cdTime);

                itemCDList.Add(cool);

            }

        }


 System/KnapSack/Logic/PackModelInterface.cs

@@ -21,16 +21,13 @@


        private int[] onekeySellTypes;

        PlayerPackModel _playerPack;

        PlayerPackModel playerPack

        {

        PlayerPackModel playerPack {

            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); }

        }



        ItemTipsModel _itemTipsModel;

        ItemTipsModel itemTipsModel

        {

            get

            {

        ItemTipsModel itemTipsModel {

            get {

                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());

            }

        }

@@ -1044,8 +1041,8 @@
                KnapsackTimeCDMgr.Instance.UnRegister(guid);

                return;

            }

            double remainTime = itemConfig.ExpireTime - time;

            KnapsackTimeCDMgr.Instance.Register(guid,itemID,remainTime, serverSurplusTime);

            double remainTime = (serverSurplusTime > 0 ? serverSurplusTime : itemConfig.ExpireTime) - time;

            KnapsackTimeCDMgr.Instance.Register(guid, itemID, remainTime);

        }



        public double GetTimeOffest(DateTime getTime)


 System/KnapSack/Logic/PlayerPackModels.cs

@@ -435,13 +435,7 @@
                        || modellist[i].itemId == 903

                        || modellist[i].itemId == 904)

                    {

                        var realCdTime = 0;

                        if (modellist[i].useDataDict != null && modellist[i].useDataDict.ContainsKey(48) && modellist[i].useDataDict[48].Count > 0)

                        {

                            realCdTime = modellist[i].useDataDict[48][0];

                        }



                        KnapsackTimeCDMgr.Instance.Register(modellist[i].itemInfo.ItemGUID, modellist[i].itemInfo.ItemID, configCdTime, realCdTime);

                        KnapsackTimeCDMgr.Instance.Register(modellist[i].itemInfo.ItemGUID, modellist[i].itemInfo.ItemID, configCdTime);

                        break;

                    }

                }