| Core/NetworkPackage/DTCFile/ClientPack.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Lua/Gen/SnxxzUIGatherSoulDungeonModelWrap.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Lua/Gen/SnxxzUIKnapsackTimeCDMgrWrap.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Lua/Gen/SnxxzUIPackModelInterfaceWrap.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Lua/Gen/XLuaGenAutoRegister.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Lua/Gen/XLuaGenAutoRegister.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/ItemModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/PlayerPackModels.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/NetworkPackage/DTCFile/ClientPack.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: 722e5e3d30096674e811f5bd191246a0 folderAsset: yes timeCreated: 1539228128 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: Lua/Gen/SnxxzUIGatherSoulDungeonModelWrap.cs
@@ -21,12 +21,14 @@ { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); System.Type type = typeof(Snxxz.UI.GatherSoulDungeonModel); Utils.BeginObjectRegister(type, L, translator, 0, 10, 9, 1); Utils.BeginObjectRegister(type, L, translator, 0, 12, 9, 1); Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init); Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize); Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPlayerLoginOk", _m_OnPlayerLoginOk); Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit); Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetAttackDefendSurplusCount", _m_GetAttackDefendSurplusCount); Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetIceDefendSurplusCount", _m_GetIceDefendSurplusCount); Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnReceiveDungeonMessage", _m_OnReceiveDungeonMessage); Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetDungeonItems", _m_TryGetDungeonItems); Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetDefendNpcCount", _m_GetDefendNpcCount); @@ -201,6 +203,62 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _m_GetAttackDefendSurplusCount(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.GatherSoulDungeonModel gen_to_be_invoked = (Snxxz.UI.GatherSoulDungeonModel)translator.FastGetCSObj(L, 1); { int gen_ret = gen_to_be_invoked.GetAttackDefendSurplusCount( ); LuaAPI.xlua_pushinteger(L, gen_ret); return 1; } } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _m_GetIceDefendSurplusCount(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.GatherSoulDungeonModel gen_to_be_invoked = (Snxxz.UI.GatherSoulDungeonModel)translator.FastGetCSObj(L, 1); { int gen_ret = gen_to_be_invoked.GetIceDefendSurplusCount( ); LuaAPI.xlua_pushinteger(L, gen_ret); return 1; } } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _m_OnReceiveDungeonMessage(RealStatePtr L) { try { Lua/Gen/SnxxzUIKnapsackTimeCDMgrWrap.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 642127ab104febd4193bdbc5ceea06fa timeCreated: 1546147185 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Lua/Gen/SnxxzUIPackModelInterfaceWrap.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 616e49c88c2f66f49b13217febba0b98 timeCreated: 1546147185 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Lua/Gen/XLuaGenAutoRegister.cs
New file @@ -0,0 +1,921 @@ #if USE_UNI_LUA using LuaAPI = UniLua.Lua; using RealStatePtr = UniLua.ILuaState; using LuaCSFunction = UniLua.CSharpFunctionDelegate; #else using LuaAPI = XLua.LuaDLL.Lua; using RealStatePtr = System.IntPtr; using LuaCSFunction = XLua.LuaDLL.lua_CSFunction; #endif using System; using System.Collections.Generic; using System.Reflection; namespace XLua.CSObjectWrap { public class XLua_Gen_Initer_Register__ { static void wrapInit0(LuaEnv luaenv, ObjectTranslator translator) { translator.DelayWrapLoader(typeof(UnityEngine.UI.Image), UnityEngineUIImageWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.UI.Text), UnityEngineUITextWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.UI.Button), UnityEngineUIButtonWrap.__Register); translator.DelayWrapLoader(typeof(DebugEx), DebugExWrap.__Register); translator.DelayWrapLoader(typeof(ResourcesPath), ResourcesPathWrap.__Register); translator.DelayWrapLoader(typeof(AssetSource), AssetSourceWrap.__Register); translator.DelayWrapLoader(typeof(Equation), EquationWrap.__Register); translator.DelayWrapLoader(typeof(LaunchPostProcess), LaunchPostProcessWrap.__Register); translator.DelayWrapLoader(typeof(Config), ConfigWrap.__Register); translator.DelayWrapLoader(typeof(PlayerStoneData), PlayerStoneDataWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.MarketModel), SnxxzUIMarketModelWrap.__Register); translator.DelayWrapLoader(typeof(PlayerDatas), PlayerDatasWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RealmModel), SnxxzUIRealmModelWrap.__Register); translator.DelayWrapLoader(typeof(SnxxzGame), SnxxzGameWrap.__Register); translator.DelayWrapLoader(typeof(GameNetSystem), GameNetSystemWrap.__Register); translator.DelayWrapLoader(typeof(AssetBundleUtility), AssetBundleUtilityWrap.__Register); translator.DelayWrapLoader(typeof(GameObjectPoolManager), GameObjectPoolManagerWrap.__Register); translator.DelayWrapLoader(typeof(UILoader), UILoaderWrap.__Register); translator.DelayWrapLoader(typeof(SDKUtility), SDKUtilityWrap.__Register); translator.DelayWrapLoader(typeof(SFXPlayUtility), SFXPlayUtilityWrap.__Register); translator.DelayWrapLoader(typeof(AnyCountDownUtility), AnyCountDownUtilityWrap.__Register); translator.DelayWrapLoader(typeof(AssetPreLoad), AssetPreLoadWrap.__Register); translator.DelayWrapLoader(typeof(FlyObjectManager), FlyObjectManagerWrap.__Register); translator.DelayWrapLoader(typeof(SkillHelper), SkillHelperWrap.__Register); translator.DelayWrapLoader(typeof(StatusMgr), StatusMgrWrap.__Register); translator.DelayWrapLoader(typeof(BossFakeLineUtility), BossFakeLineUtilityWrap.__Register); translator.DelayWrapLoader(typeof(BattleEffectPlayRule), BattleEffectPlayRuleWrap.__Register); translator.DelayWrapLoader(typeof(GAMgr), GAMgrWrap.__Register); translator.DelayWrapLoader(typeof(MapTransferUtility), MapTransferUtilityWrap.__Register); translator.DelayWrapLoader(typeof(PreFightMission), PreFightMissionWrap.__Register); translator.DelayWrapLoader(typeof(PrepareHandler), PrepareHandlerWrap.__Register); translator.DelayWrapLoader(typeof(GuideDialogueModel), GuideDialogueModelWrap.__Register); translator.DelayWrapLoader(typeof(GuideMessageModel), GuideMessageModelWrap.__Register); translator.DelayWrapLoader(typeof(NewGuideModel), NewGuideModelWrap.__Register); translator.DelayWrapLoader(typeof(StoryHintModel), StoryHintModelWrap.__Register); translator.DelayWrapLoader(typeof(StageManager), StageManagerWrap.__Register); translator.DelayWrapLoader(typeof(LuaBehaviour), LuaBehaviourWrap.__Register); translator.DelayWrapLoader(typeof(ConfigUtil), ConfigUtilWrap.__Register); translator.DelayWrapLoader(typeof(LuaGameNetPackBase), LuaGameNetPackBaseWrap.__Register); translator.DelayWrapLoader(typeof(LuaGameNetSystem), LuaGameNetSystemWrap.__Register); translator.DelayWrapLoader(typeof(object), SystemObjectWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Object), UnityEngineObjectWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Vector2), UnityEngineVector2Wrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Vector3), UnityEngineVector3Wrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Vector4), UnityEngineVector4Wrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Quaternion), UnityEngineQuaternionWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Color), UnityEngineColorWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Ray), UnityEngineRayWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Bounds), UnityEngineBoundsWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Ray2D), UnityEngineRay2DWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Time), UnityEngineTimeWrap.__Register); } static void wrapInit1(LuaEnv luaenv, ObjectTranslator translator) { translator.DelayWrapLoader(typeof(UnityEngine.GameObject), UnityEngineGameObjectWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Component), UnityEngineComponentWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Behaviour), UnityEngineBehaviourWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Transform), UnityEngineTransformWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Resources), UnityEngineResourcesWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.TextAsset), UnityEngineTextAssetWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Keyframe), UnityEngineKeyframeWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.AnimationCurve), UnityEngineAnimationCurveWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.AnimationClip), UnityEngineAnimationClipWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.MonoBehaviour), UnityEngineMonoBehaviourWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.ParticleSystem), UnityEngineParticleSystemWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.SkinnedMeshRenderer), UnityEngineSkinnedMeshRendererWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Renderer), UnityEngineRendererWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.WWW), UnityEngineWWWWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Light), UnityEngineLightWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Mathf), UnityEngineMathfWrap.__Register); translator.DelayWrapLoader(typeof(System.Collections.Generic.List<int>), SystemCollectionsGenericList_1_SystemInt32_Wrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Debug), UnityEngineDebugWrap.__Register); translator.DelayWrapLoader(typeof(ModelUtility), ModelUtilityWrap.__Register); translator.DelayWrapLoader(typeof(LuaWindow), LuaWindowWrap.__Register); translator.DelayWrapLoader(typeof(LuaWindowUtility), LuaWindowUtilityWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.AchievementModel), SnxxzUIAchievementModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ActivityModel), SnxxzUIActivityModelWrap.__Register); translator.DelayWrapLoader(typeof(AssetVersionUtility), AssetVersionUtilityWrap.__Register); translator.DelayWrapLoader(typeof(DownLoadAndDiscompressTask), DownLoadAndDiscompressTaskWrap.__Register); translator.DelayWrapLoader(typeof(InGameDownLoad), InGameDownLoadWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.BetterEquipGetModel), SnxxzUIBetterEquipGetModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ItemUseModel), SnxxzUIItemUseModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.PreciousItemGetModel), SnxxzUIPreciousItemGetModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RealmBetterEquipModel), SnxxzUIRealmBetterEquipModelWrap.__Register); translator.DelayWrapLoader(typeof(BlastFurnaceModel), BlastFurnaceModelWrap.__Register); translator.DelayWrapLoader(typeof(GetItemPathModel), GetItemPathModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.PrayForDurgModel), SnxxzUIPrayForDurgModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.BossRebornModel), SnxxzUIBossRebornModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.BossShowModel), SnxxzUIBossShowModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ChatBubbleModel), SnxxzUIChatBubbleModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ChatCenter), SnxxzUIChatCenterWrap.__Register); translator.DelayWrapLoader(typeof(VoiceHttpRequest), VoiceHttpRequestWrap.__Register); translator.DelayWrapLoader(typeof(VersionUtility), VersionUtilityWrap.__Register); translator.DelayWrapLoader(typeof(ComposeWinModel), ComposeWinModelWrap.__Register); translator.DelayWrapLoader(typeof(SelectEquipModel), SelectEquipModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.CrossServerOneVsOneModel), SnxxzUICrossServerOneVsOneModelWrap.__Register); translator.DelayWrapLoader(typeof(Item_Class), Item_ClassWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.OpponentInformation), SnxxzUIOpponentInformationWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.DailyQuestActionTimer), SnxxzUIDailyQuestActionTimerWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.DailyQuestModel), SnxxzUIDailyQuestModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ResourcesBackModel), SnxxzUIResourcesBackModelWrap.__Register); translator.DelayWrapLoader(typeof(DebugUtility), DebugUtilityWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.DogzModel), SnxxzUIDogzModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.DogzPackModel), SnxxzUIDogzPackModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.DogzDungeonModel), SnxxzUIDogzDungeonModelWrap.__Register); } static void wrapInit2(LuaEnv luaenv, ObjectTranslator translator) { translator.DelayWrapLoader(typeof(Snxxz.UI.DungeonAssistModel), SnxxzUIDungeonAssistModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.Dungeon), SnxxzUIDungeonWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.DungeonLiquidModel), SnxxzUIDungeonLiquidModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.DungeonModel), SnxxzUIDungeonModelWrap.__Register); translator.DelayWrapLoader(typeof(IceLodeStarAwardClass), IceLodeStarAwardClassWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TrialDungeonModel), SnxxzUITrialDungeonModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FairyBossModel), SnxxzUIFairyBossModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FairyFeastModel), SnxxzUIFairyFeastModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FairyGrabBossModel), SnxxzUIFairyGrabBossModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FairyLeagueModel), SnxxzUIFairyLeagueModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FairyModel), SnxxzUIFairyModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.KingFairyModel), SnxxzUIKingFairyModelWrap.__Register); translator.DelayWrapLoader(typeof(UnionTaskModel), UnionTaskModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FairylandCeremonyModel), SnxxzUIFairylandCeremonyModelWrap.__Register); translator.DelayWrapLoader(typeof(FakeDungeonUtility), FakeDungeonUtilityWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.BossHomeModel), SnxxzUIBossHomeModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.DemonJarModel), SnxxzUIDemonJarModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ElderGodAreaModel), SnxxzUIElderGodAreaModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FindPreciousModel), SnxxzUIFindPreciousModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FindPreciousTimer), SnxxzUIFindPreciousTimerWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.PersonalBossModel), SnxxzUIPersonalBossModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RewardPreviewGroup), SnxxzUIRewardPreviewGroupWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.WorldBossModel), SnxxzUIWorldBossModelWrap.__Register); translator.DelayWrapLoader(typeof(FriendsModel), FriendsModelWrap.__Register); translator.DelayWrapLoader(typeof(GMCmdModel), GMCmdModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.GatherSoulComposeModel), SnxxzUIGatherSoulComposeModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.GatherSoulDungeonModel), SnxxzUIGatherSoulDungeonModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.GatheringSoulModel), SnxxzUIGatheringSoulModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.VirtualPackModel), SnxxzUIVirtualPackModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.GuardModel), SnxxzUIGuardModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.HappyXBModel), SnxxzUIHappyXBModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.HeavenBattleInfo), SnxxzUIHeavenBattleInfoWrap.__Register); translator.DelayWrapLoader(typeof(HeavenBattleModel), HeavenBattleModelWrap.__Register); translator.DelayWrapLoader(typeof(HttpRequest), HttpRequestWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FBHelpPointExchageModel), SnxxzUIFBHelpPointExchageModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.KnapsackTimeCDMgr), SnxxzUIKnapsackTimeCDMgrWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.BoxGetItemModel), SnxxzUIBoxGetItemModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ItemOverdueModel), SnxxzUIItemOverdueModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ItemTipsModel), SnxxzUIItemTipsModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.PackModelInterface), SnxxzUIPackModelInterfaceWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.PackSendQuestMgr), SnxxzUIPackSendQuestMgrWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.PlayerPackModel), SnxxzUIPlayerPackModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TreasureEffectModel), SnxxzUITreasureEffectModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.BatchUseModel), SnxxzUIBatchUseModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.KingTreasureShowModel), SnxxzUIKingTreasureShowModelWrap.__Register); translator.DelayWrapLoader(typeof(KnapSackEventMgr), KnapSackEventMgrWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.LoginModel), SnxxzUILoginModelWrap.__Register); translator.DelayWrapLoader(typeof(ServerListCenter), ServerListCenterWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.LoginAdModel), SnxxzUILoginAdModelWrap.__Register); translator.DelayWrapLoader(typeof(CapacityDelayModel), CapacityDelayModelWrap.__Register); translator.DelayWrapLoader(typeof(CoinTaskTipModel), CoinTaskTipModelWrap.__Register); } static void wrapInit3(LuaEnv luaenv, ObjectTranslator translator) { translator.DelayWrapLoader(typeof(FeatureNoticeModel), FeatureNoticeModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.MainRedDot), SnxxzUIMainRedDotWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.OffLineOnHookModel), SnxxzUIOffLineOnHookModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.PKModel), SnxxzUIPKModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.StoryMissionsModel), SnxxzUIStoryMissionsModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TaskAllocation), SnxxzUITaskAllocationWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TipPanel), SnxxzUITipPanelWrap.__Register); translator.DelayWrapLoader(typeof(PutawayData), PutawayDataWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.BattleHint), SnxxzUIBattleHintWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.GMNotify), SnxxzUIGMNotifyWrap.__Register); translator.DelayWrapLoader(typeof(SysNotifyMgr), SysNotifyMgrWrap.__Register); translator.DelayWrapLoader(typeof(HorseClass), HorseClassWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FunctionalGuideCenter), SnxxzUIFunctionalGuideCenterWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.NewBieCenter), SnxxzUINewBieCenterWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.OffLineTimeLackModel), SnxxzUIOffLineTimeLackModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.AccumulateRechargeModel), SnxxzUIAccumulateRechargeModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FlashRushToBuyModel), SnxxzUIFlashRushToBuyModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FlashSaleModel), SnxxzUIFlashSaleModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ImpactRankModel), SnxxzUIImpactRankModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.OpenServerActivityCenter), SnxxzUIOpenServerActivityCenterWrap.__Register); translator.DelayWrapLoader(typeof(InSevenDayModel), InSevenDayModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.MonthlyInvestmentModel), SnxxzUIMonthlyInvestmentModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.MysticalPurchaseModel), SnxxzUIMysticalPurchaseModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.OSGiftModel), SnxxzUIOSGiftModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.OSRedEnvelopeModel), SnxxzUIOSRedEnvelopeModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.OpenServerActivityNotifyModel), SnxxzUIOpenServerActivityNotifyModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RedEnvelopeModel), SnxxzUIRedEnvelopeModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.WishingPoolModel), SnxxzUIWishingPoolModelWrap.__Register); translator.DelayWrapLoader(typeof(PetReinforceModel), PetReinforceModelWrap.__Register); translator.DelayWrapLoader(typeof(PetBackpack), PetBackpackWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RidingAndPetActivationModel), SnxxzUIRidingAndPetActivationModelWrap.__Register); translator.DelayWrapLoader(typeof(PlayerDeadModel), PlayerDeadModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RankModel), SnxxzUIRankModelWrap.__Register); translator.DelayWrapLoader(typeof(RealmPracticeModel), RealmPracticeModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.Redpoint), SnxxzUIRedpointWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RedpointCenter), SnxxzUIRedpointCenterWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.MagicianModel), SnxxzUIMagicianModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RoleModel), SnxxzUIRoleModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RolePointModel), SnxxzUIRolePointModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TitleModel), SnxxzUITitleModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RoleParticularModel), SnxxzUIRoleParticularModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RolePromoteModel), SnxxzUIRolePromoteModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RuneComposeModel), SnxxzUIRuneComposeModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RuneModel), SnxxzUIRuneModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.RuneTowerModel), SnxxzUIRuneTowerModelWrap.__Register); translator.DelayWrapLoader(typeof(QuickSetting), QuickSettingWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.SkillModel), SnxxzUISkillModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TalentModel), SnxxzUITalentModelWrap.__Register); translator.DelayWrapLoader(typeof(CoroutineMgr), CoroutineMgrWrap.__Register); translator.DelayWrapLoader(typeof(BuyItemPopModel), BuyItemPopModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.BuySuccessModel), SnxxzUIBuySuccessModelWrap.__Register); } static void wrapInit4(LuaEnv luaenv, ObjectTranslator translator) { translator.DelayWrapLoader(typeof(StoreModel), StoreModelWrap.__Register); translator.DelayWrapLoader(typeof(EquipReinforceModel), EquipReinforceModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.PlayerSuitModel), SnxxzUIPlayerSuitModelWrap.__Register); translator.DelayWrapLoader(typeof(EquipWashModel), EquipWashModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.GemModel), SnxxzUIGemModelWrap.__Register); translator.DelayWrapLoader(typeof(GodBeastModel), GodBeastModelWrap.__Register); translator.DelayWrapLoader(typeof(HowToPlayModel), HowToPlayModelWrap.__Register); translator.DelayWrapLoader(typeof(WashProModel), WashProModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.WingsRedDot), SnxxzUIWingsRedDotWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ActivitiesPushMgr), SnxxzUIActivitiesPushMgrWrap.__Register); translator.DelayWrapLoader(typeof(ChatSetting), ChatSettingWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FuncSwitchModel), SnxxzUIFuncSwitchModelWrap.__Register); translator.DelayWrapLoader(typeof(HangUpSetModel), HangUpSetModelWrap.__Register); translator.DelayWrapLoader(typeof(PrivateRemind), PrivateRemindWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.SetPrivateModel), SnxxzUISetPrivateModelWrap.__Register); translator.DelayWrapLoader(typeof(SettingEffectMgr), SettingEffectMgrWrap.__Register); translator.DelayWrapLoader(typeof(SettingMgr), SettingMgrWrap.__Register); translator.DelayWrapLoader(typeof(SystemSetting), SystemSettingWrap.__Register); translator.DelayWrapLoader(typeof(TaiChiModel), TaiChiModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.GroupDungeonChallengeProcessor), SnxxzUIGroupDungeonChallengeProcessorWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TeamModel), SnxxzUITeamModelWrap.__Register); translator.DelayWrapLoader(typeof(PwdKeyboard), PwdKeyboardWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TreasureModel), SnxxzUITreasureModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TreasureSoulModel), SnxxzUITreasureSoulModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TreasureFindHostModel), SnxxzUITreasureFindHostModelWrap.__Register); translator.DelayWrapLoader(typeof(FairyJadeInvestmentModel), FairyJadeInvestmentModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FirstTimeRechargeModel), SnxxzUIFirstTimeRechargeModelWrap.__Register); translator.DelayWrapLoader(typeof(LimitedTimePackageItemClassModel), LimitedTimePackageItemClassModelWrap.__Register); translator.DelayWrapLoader(typeof(NeedForWhiteModel), NeedForWhiteModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.OSTimeLimitGiftModel), SnxxzUIOSTimeLimitGiftModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.VipInvestModel), SnxxzUIVipInvestModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.WheelOfFortuneModel), SnxxzUIWheelOfFortuneModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.VipModel), SnxxzUIVipModelWrap.__Register); translator.DelayWrapLoader(typeof(SpeechTranslate), SpeechTranslateWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.AwardExchangeModel), SnxxzUIAwardExchangeModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ConsumeRebateModel), SnxxzUIConsumeRebateModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.LevelGiftModel), SnxxzUILevelGiftModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.MultipleExpModel), SnxxzUIMultipleExpModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.MultipleRealmPointModel), SnxxzUIMultipleRealmPointModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.OperationTimeHepler), SnxxzUIOperationTimeHeplerWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.PrayerModel), SnxxzUIPrayerModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.SignInModel), SnxxzUISignInModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.WelfareCenter), SnxxzUIWelfareCenterWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ModelCenter), SnxxzUIModelCenterWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.WindowCenter), SnxxzUIWindowCenterWrap.__Register); translator.DelayWrapLoader(typeof(WindowJumpMgr), WindowJumpMgrWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.MapModel), SnxxzUIMapModelWrap.__Register); translator.DelayWrapLoader(typeof(WorldMapSkip), WorldMapSkipWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.FunctionButton), SnxxzUIFunctionButtonWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.ItemBehaviour), SnxxzUIItemBehaviourWrap.__Register); translator.DelayWrapLoader(typeof(TimeDownMgr), TimeDownMgrWrap.__Register); } static void wrapInit5(LuaEnv luaenv, ObjectTranslator translator) { translator.DelayWrapLoader(typeof(Snxxz.UI.UI3DModelExhibition), SnxxzUIUI3DModelExhibitionWrap.__Register); translator.DelayWrapLoader(typeof(ButtonEx), ButtonExWrap.__Register); translator.DelayWrapLoader(typeof(EffectMgr), EffectMgrWrap.__Register); translator.DelayWrapLoader(typeof(TimeMgr), TimeMgrWrap.__Register); translator.DelayWrapLoader(typeof(UIEffect), UIEffectWrap.__Register); translator.DelayWrapLoader(typeof(ComponentExtersion), ComponentExtersionWrap.__Register); translator.DelayWrapLoader(typeof(DeviceUtility), DeviceUtilityWrap.__Register); translator.DelayWrapLoader(typeof(FileExtersion), FileExtersionWrap.__Register); translator.DelayWrapLoader(typeof(GMCommand), GMCommandWrap.__Register); translator.DelayWrapLoader(typeof(GlobalTimeEvent), GlobalTimeEventWrap.__Register); translator.DelayWrapLoader(typeof(LanguageVerify), LanguageVerifyWrap.__Register); translator.DelayWrapLoader(typeof(LayerUtility), LayerUtilityWrap.__Register); translator.DelayWrapLoader(typeof(MaterialUtility), MaterialUtilityWrap.__Register); translator.DelayWrapLoader(typeof(OperationLogCollect), OperationLogCollectWrap.__Register); translator.DelayWrapLoader(typeof(RunTimeExceptionUtility), RunTimeExceptionUtilityWrap.__Register); translator.DelayWrapLoader(typeof(TimeUtility), TimeUtilityWrap.__Register); translator.DelayWrapLoader(typeof(TransformExtension), TransformExtensionWrap.__Register); translator.DelayWrapLoader(typeof(UIHelper), UIHelperWrap.__Register); translator.DelayWrapLoader(typeof(UIUtility), UIUtilityWrap.__Register); } static void Init(LuaEnv luaenv, ObjectTranslator translator) { wrapInit0(luaenv, translator); wrapInit1(luaenv, translator); wrapInit2(luaenv, translator); wrapInit3(luaenv, translator); wrapInit4(luaenv, translator); wrapInit5(luaenv, translator); translator.AddInterfaceBridgeCreator(typeof(System.Collections.IEnumerator), SystemCollectionsIEnumeratorBridge.__Create); } static XLua_Gen_Initer_Register__() { XLua.LuaEnv.AddIniter(Init); } } } namespace XLua { public partial class ObjectTranslator { static XLua.CSObjectWrap.XLua_Gen_Initer_Register__ s_gen_reg_dumb_obj = new XLua.CSObjectWrap.XLua_Gen_Initer_Register__(); static XLua.CSObjectWrap.XLua_Gen_Initer_Register__ gen_reg_dumb_obj {get{return s_gen_reg_dumb_obj;}} } internal partial class InternalGlobals { static InternalGlobals() { extensionMethodMap = new Dictionary<Type, IEnumerable<MethodInfo>>() { }; genTryArrayGetPtr = StaticLuaCallbacks.__tryArrayGet; genTryArraySetPtr = StaticLuaCallbacks.__tryArraySet; } } } Lua/Gen/XLuaGenAutoRegister.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 11479d6613f53454b9f092ed34c058f8 timeCreated: 1546147185 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/KnapSack/Logic/ItemModel.cs
@@ -56,9 +56,9 @@ useDataDict = ConfigParse.Analysis(info.UserData); var serverSurplusTime = 0; if (useDataDict.ContainsKey(48) && useDataDict[48].Count > 0) if (useDataDict != null && useDataDict.ContainsKey(48) && useDataDict[48].Count > 0) { serverSurplusTime=useDataDict[48][0]; serverSurplusTime = useDataDict[48][0]; } this.equipScore = modelInterface.SetEquipScore(packType,itemInfo.ItemID,useDataDict); System/KnapSack/Logic/PlayerPackModels.cs
@@ -9,7 +9,7 @@ namespace Snxxz.UI { [XLua.LuaCallCSharp] public class PlayerPackModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk public class PlayerPackModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk { public Dictionary<int, int> DrugToDungeonDict { get; private set; } //key 丹药ID,value副本ID @@ -24,7 +24,7 @@ public int MaxDepotGridCnt { get; private set; } public int InitDepotGridCnt { get; private set; } BlastFurnaceModel FurnaceModel { get { return ModelCenter.Instance.GetModel<BlastFurnaceModel>(); } } public List<int> LocalSavePlaceArray { get; private set;} public List<int> LocalSavePlaceArray { get; private set; } public override void Init() { ParseConfig(); @@ -51,9 +51,9 @@ makeDruglist = new List<AttrFruitConfig>(); List<AttrFruitConfig> fruitlist = Config.Instance.GetAllValues<AttrFruitConfig>(); for(int i = 0; i < fruitlist.Count; i++) for (int i = 0; i < fruitlist.Count; i++) { if(fruitlist[i].FuncID == 2) if (fruitlist[i].FuncID == 2) { makeDruglist.Add(fruitlist[i]); } @@ -64,14 +64,14 @@ decomposeAttrDict.Clear(); List<EquipDeComposeConfig> decomlist = Config.Instance.GetAllValues<EquipDeComposeConfig>(); for(int i = 0; i < decomlist.Count;i++) for (int i = 0; i < decomlist.Count; i++) { JsonData attrData = JsonMapper.ToObject(decomlist[i].Attr); Dictionary<int, int> attrDict = new Dictionary<int, int>(); decomposeAttrDict.Add(decomlist[i].LV,attrDict); decomposeAttrDict.Add(decomlist[i].LV, attrDict); foreach (var id in attrData.Keys) { attrDict.Add(int.Parse(id),int.Parse(attrData[id].ToString())); attrDict.Add(int.Parse(id), int.Parse(attrData[id].ToString())); } } @@ -109,7 +109,7 @@ public void OnAfterPlayerDataInitialize() { } public void OnPlayerLoginOk() @@ -119,7 +119,7 @@ EquipDecomRedCtrl(); RoleEquipLocalSave = StringUtility.Contact("RoleEquipLocalSave", PlayerDatas.Instance.baseData.PlayerID); StrengthAttrShift_RecordKey = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "StrengthAttrShift"); if(LocalSave.GetIntArray(RoleEquipLocalSave) != null) if (LocalSave.GetIntArray(RoleEquipLocalSave) != null) { LocalSavePlaceArray = LocalSave.GetIntArray(RoleEquipLocalSave).ToList(); } @@ -127,27 +127,24 @@ { LocalSavePlaceArray = null; } PlayerDatas.Instance.PlayerDataRefreshInfoEvent += UpdatePlayerLv; UpdatePlayerLv(PlayerDataRefresh.LV); } public override void UnInit() { } PackModelInterface _modelInterface; PackModelInterface modelInterface { PackModelInterface modelInterface { get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); } } ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } @@ -162,7 +159,7 @@ public event Action<int> RefreshItemDayUseCntAct; //刷新物品每日使用数量 public event Action<int> RefreshItemSumUseCntAct; //刷新物品总使用数量 public bool isPlayBetterEquipEffect { get;set;} //整理背包时是否播放特效 public bool isPlayBetterEquipEffect { get; set; } //整理背包时是否播放特效 #region 接收服务端数据 public bool showDropItem { get; private set; } @@ -178,8 +175,8 @@ SinglePackModel packModel = new SinglePackModel(type); playerPackDict.Add(type, packModel); } if(isPlayBetterEquipEffect) if (isPlayBetterEquipEffect) { modelInterface.itemModelDict.Clear(); } @@ -248,11 +245,11 @@ itemInfo.ItemGUID = item.ItemGUID; playerPackDict[type].SetPackModel(itemInfo); DebugEx.Log("Add:" + item.ItemGUID); if(RefreshItemCountAct != null) if (RefreshItemCountAct != null) { RefreshItemCountAct(type, itemInfo.ItemPlace, itemInfo.ItemID); } if (ItemCntAddAct != null) { ItemCntAddAct(type, itemInfo.ItemPlace, itemInfo.ItemID); @@ -276,7 +273,7 @@ playerPackDict[type].SetOpenGridCount(useCount.CanUseCount); if(GridRefreshEvent != null) if (GridRefreshEvent != null) { GridRefreshEvent(type); } @@ -290,8 +287,8 @@ isPlayBetterEquipEffect = false; PackType type = (PackType)refresh.PackType; SinglePackModel singlePack = null; playerPackDict.TryGetValue(type,out singlePack); if(singlePack != null) playerPackDict.TryGetValue(type, out singlePack); if (singlePack != null) { ItemModel itemModel = singlePack.GetItemModelByIndex(refresh.ItemIndex); if (itemModel != null) @@ -303,14 +300,14 @@ } itemModel.RefreshItemCount(refresh.ItemCount); if(isAddItemCount) if (isAddItemCount) { if (ItemCntAddAct != null) { ItemCntAddAct(type,itemModel.itemInfo.ItemPlace, itemModel.itemInfo.ItemID); ItemCntAddAct(type, itemModel.itemInfo.ItemPlace, itemModel.itemInfo.ItemID); } modelInterface.GetPreciousItem(itemModel); modelInterface.RefreshPickItem(type,itemModel.itemInfo.ItemGUID); modelInterface.RefreshPickItem(type, itemModel.itemInfo.ItemGUID); } else { @@ -327,7 +324,7 @@ } } } public void ClearPackModel(H0711_tagClearItemPack clearPack) @@ -335,7 +332,7 @@ PackType type = (PackType)clearPack.PackIndex; SinglePackModel singlePack = null; playerPackDict.TryGetValue(type, out singlePack); if(singlePack != null) if (singlePack != null) { singlePack.ClearPackModel(); } @@ -357,7 +354,7 @@ isPlayBetterEquipEffect = false; SetLookIndex(null); PackType type = (PackType)clearItem.PackType; SinglePackModel singlePack = null; playerPackDict.TryGetValue(type, out singlePack); string guid = ""; @@ -366,16 +363,16 @@ ItemModel itemModel = singlePack.GetItemModelByIndex(clearItem.ItemIndex); guid = itemModel.itemInfo.ItemGUID; int itemId = itemModel.itemInfo.ItemID; DeleteItemDictByGUID(type,itemModel.itemInfo.ItemGUID); DeleteItemDictByGUID(type, itemModel.itemInfo.ItemGUID); singlePack.ClearItemModelByIndex(clearItem.ItemIndex); if (RefreshItemCountAct != null) { RefreshItemCountAct(type, clearItem.ItemIndex,itemId); RefreshItemCountAct(type, clearItem.ItemIndex, itemId); } if (ItemCntReduceAct != null) { ItemCntReduceAct(type,clearItem.ItemIndex, itemId); ItemCntReduceAct(type, clearItem.ItemIndex, itemId); } } if (type == PackType.rptEquip) @@ -389,7 +386,7 @@ { KnapsackTimeCDMgr.Instance.UnRegister(guid); } } public void PackResetOk(H0316_tagPackResetOK packreset) @@ -405,7 +402,7 @@ return; ItemConfig itemConfig = Config.Instance.Get<ItemConfig>((int)success.ItemID); MakeUseItemSuccess(success.ItemIndex,(int)success.ItemID); MakeUseItemSuccess(success.ItemIndex, (int)success.ItemID); switch (success.ItemID) { @@ -419,7 +416,7 @@ if (UseItemSuccessAct != null) { UseItemSuccessAct(success.ItemIndex,(int)success.ItemID); UseItemSuccessAct(success.ItemIndex, (int)success.ItemID); } } @@ -439,7 +436,7 @@ || modellist[i].itemId == 904) { var realCdTime = 0; if (modellist[i].useDataDict.ContainsKey(48) && modellist[i].useDataDict[48].Count > 0) if (modellist[i].useDataDict != null && modellist[i].useDataDict.ContainsKey(48) && modellist[i].useDataDict[48].Count > 0) { realCdTime = modellist[i].useDataDict[48][0]; } @@ -454,9 +451,9 @@ public void SetItemGUIDDict(ItemModel itemModel) { if(!itemGUIDDict.ContainsKey(itemModel.itemInfo.ItemGUID)) if (!itemGUIDDict.ContainsKey(itemModel.itemInfo.ItemGUID)) { itemGUIDDict.Add(itemModel.itemInfo.ItemGUID,itemModel); itemGUIDDict.Add(itemModel.itemInfo.ItemGUID, itemModel); GetItemEventCtrl(itemModel); } else @@ -470,12 +467,12 @@ } } public void DeleteItemDictByGUID(PackType type,string guid) public void DeleteItemDictByGUID(PackType type, string guid) { if(itemGUIDDict.ContainsKey(guid)) if (itemGUIDDict.ContainsKey(guid)) { if(itemGUIDDict[guid].packType == type) if (itemGUIDDict[guid].packType == type) { itemGUIDDict.Remove(guid); } @@ -501,11 +498,11 @@ itemDayUseCntDict[itemId] = cnt; } if(RefreshItemDayUseCntAct != null) if (RefreshItemDayUseCntAct != null) { RefreshItemDayUseCntAct(itemId); } } } @@ -538,17 +535,17 @@ private Dictionary<int, int> equipAttrActiveDict = new Dictionary<int, int>(); public void SetPlayerEquipAttrActiveInfo(HA317_tagMCAllEquipAttrActiveInfo info) { for(int i = 0;i < info.Count; i++) for (int i = 0; i < info.Count; i++) { int type = info.ActiveInfo[i].Type; int cnt = (int)info.ActiveInfo[i].Cnt; if(type == 1) if (type == 1) { cnt = RoleEquipStarsConfig.GetActiveStars(cnt); } if(!equipAttrActiveDict.ContainsKey(type)) if (!equipAttrActiveDict.ContainsKey(type)) { equipAttrActiveDict.Add(type,cnt); equipAttrActiveDict.Add(type, cnt); } else { @@ -556,7 +553,7 @@ } } if(RefreshActiveAttrAct != null) if (RefreshActiveAttrAct != null) { RefreshActiveAttrAct(); } @@ -564,7 +561,7 @@ SetPlayerAttrActiveRedPoint(); } public void SendActiveAttrQuest(int type,int cnt) public void SendActiveAttrQuest(int type, int cnt) { CA503_tagCMActiveAllEquipAttr equipAttr = new CA503_tagCMActiveAllEquipAttr(); equipAttr.Type = (byte)type; @@ -575,7 +572,7 @@ public int GetActiveCntByType(int type) { int cnt = 0; equipAttrActiveDict.TryGetValue(type,out cnt); equipAttrActiveDict.TryGetValue(type, out cnt); return cnt; } @@ -603,9 +600,9 @@ } RoleEquipStarsConfig activeStarsConfig = RoleEquipStarsConfig.GetEquipStarsModel(realActiveStars); if(activeStarsConfig != null) if (activeStarsConfig != null) { for(int i = 0; i < activeStarsConfig.attType.Length; i++) for (int i = 0; i < activeStarsConfig.attType.Length; i++) { activeIdlist.Add(activeStarsConfig.attType[i]); } @@ -617,7 +614,7 @@ RoleEquipStarsConfig starsConfig = starsConfigs[i]; if (realActiveStars < starsConfig.countNeed) { for(int j = 0; j < starsConfig.attType.Length; j++) for (int j = 0; j < starsConfig.attType.Length; j++) { int attrId = starsConfig.attType[j]; if (!activeIdlist.Contains(attrId)) @@ -627,12 +624,12 @@ } } } if(isAddId) if (isAddId) { starsCount = starsConfig.countNeed; break; } } return addIdlist; } @@ -644,7 +641,7 @@ public int fairyRedPointLvlimt { get; private set; } public int wingsRedpointLvlimt { get; private set; } public int fairyGetPathId { get; private set; } public Dictionary<int, int> wingsGetPathIdDict { get; private set;} public Dictionary<int, int> wingsGetPathIdDict { get; private set; } public Dictionary<int, List<int>> dungeonUseDict { get; private set; } public void ParseConfig() { @@ -659,11 +656,11 @@ foreach (var dungeonId in copyWinData.Keys) { List<int> idlist = new List<int>(); dungeonUseDict.Add(int.Parse(dungeonId),idlist); if(copyWinData[dungeonId].IsArray) dungeonUseDict.Add(int.Parse(dungeonId), idlist); if (copyWinData[dungeonId].IsArray) { JsonData useData = copyWinData[dungeonId]; for(int i = 0; i < useData.Count; i++) for (int i = 0; i < useData.Count; i++) { idlist.Add(int.Parse(useData[i].ToString())); } @@ -672,7 +669,7 @@ } public int GetRoleEquipPathId(int equipPlace) { { int playerJob = PlayerDatas.Instance.baseData.Job; switch ((RoleEquipType)equipPlace) { @@ -680,7 +677,7 @@ case RoleEquipType.retFairyCan2: return fairyGetPathId; case RoleEquipType.retWing: if(wingsGetPathIdDict.ContainsKey(playerJob)) if (wingsGetPathIdDict.ContainsKey(playerJob)) { return wingsGetPathIdDict[playerJob]; } @@ -692,7 +689,7 @@ private void UpdatePlayerLv(PlayerDataRefresh type) { if (type != PlayerDataRefresh.LV) return; for(int i = 1; i < 13; i++) for (int i = 1; i < 13; i++) { CheckRoleEquipByPlace((RoleEquipType)i); } @@ -705,7 +702,7 @@ { case RoleEquipType.retFairyCan: case RoleEquipType.retFairyCan2: if(PlayerDatas.Instance.baseData.LV >= fairyRedPointLvlimt) if (PlayerDatas.Instance.baseData.LV >= fairyRedPointLvlimt) { return true; } @@ -722,7 +719,7 @@ public void CheckRoleEquipByPlace(RoleEquipType equipType) { ItemModel itemModel = GetItemModelByIndex(PackType.rptEquip,(int)equipType); ItemModel itemModel = GetItemModelByIndex(PackType.rptEquip, (int)equipType); switch (equipType) { case RoleEquipType.retFairyCan: @@ -738,17 +735,17 @@ SetRoleEquipLocalSave((int)equipType); } break; } } public void SetRoleEquipLocalSave(int equipPlace,bool isRedState = false) public void SetRoleEquipLocalSave(int equipPlace, bool isRedState = false) { if (isRedState && roleEquipRedDict[equipPlace].state == RedPointState.None) return; if(LocalSavePlaceArray != null) if (LocalSavePlaceArray != null) { if(!LocalSavePlaceArray.Contains(equipPlace)) if (!LocalSavePlaceArray.Contains(equipPlace)) { LocalSavePlaceArray.Add(equipPlace); LocalSave.SetIntArray(RoleEquipLocalSave, LocalSavePlaceArray.ToArray()); @@ -777,7 +774,7 @@ List<int> itemEffectTime = itemModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime); if (itemEffectTime != null && itemEffectTime[0] != 0) { if (cool == null || cool.GetRemainTime()<= 0) if (cool == null || cool.GetRemainTime() <= 0) { isOverdue = true; } @@ -797,7 +794,7 @@ { modelInterface.GetPreciousItem(itemModel); modelInterface.OnGetEquip(itemModel); modelInterface.RefreshPickItem(itemModel.packType,itemModel.itemInfo.ItemGUID); modelInterface.RefreshPickItem(itemModel.packType, itemModel.itemInfo.ItemGUID); } } @@ -822,7 +819,7 @@ return itemModel; } public ItemModel GetItemModelByIndex(PackType type,int index) public ItemModel GetItemModelByIndex(PackType type, int index) { ItemModel itemModel = null; if (playerPackDict.ContainsKey(type)) @@ -836,9 +833,9 @@ { string guid = string.Empty; foreach(var key in itemGUIDDict.Keys) foreach (var key in itemGUIDDict.Keys) { if(itemGUIDDict[key].itemId == itemId) if (itemGUIDDict[key].itemId == itemId) { guid = key; return guid; @@ -862,7 +859,7 @@ { count = singlePack.GetItemCountByID(id); } return count; } @@ -871,14 +868,14 @@ SinglePackModel singlePack = GetSinglePackModel(PackType.rptItem); if (singlePack == null) return false; List<ItemModel> modellist = null; int haveCnt = singlePack.GetItemCountByID(itemId,out modellist); int haveCnt = singlePack.GetItemCountByID(itemId, out modellist); ItemConfig config = Config.Instance.Get<ItemConfig>(itemId); int sumPutCnt = config.PackCount * modellist.Count; if(sumPutCnt > haveCnt) if (sumPutCnt > haveCnt) { return true; } else if(GetReaminGridCount(PackType.rptItem) > 0) else if (GetReaminGridCount(PackType.rptItem) > 0) { return true; } @@ -940,15 +937,15 @@ { int redKey = 102011003 + i; Redpoint redpoint = new Redpoint(MainRedDot.RedPoint_BagFuncKey, redKey); roleEquipRedDict.Add(i,redpoint); roleEquipRedDict.Add(i, redpoint); } } public void UpdateRoleEquipRed() { foreach(var key in roleEquipRedDict.Keys) foreach (var key in roleEquipRedDict.Keys) { ItemModel itemModel = GetItemModelByIndex(PackType.rptEquip,key); ItemModel itemModel = GetItemModelByIndex(PackType.rptEquip, key); switch ((RoleEquipType)key) { case RoleEquipType.retFairyCan: @@ -993,11 +990,11 @@ private bool TryGetRoleEquipLocalSave(int equipPlace) { if(LocalSavePlaceArray != null) if (LocalSavePlaceArray != null) { for(int i = 0; i < LocalSavePlaceArray.Count; i++) for (int i = 0; i < LocalSavePlaceArray.Count; i++) { if(equipPlace == 9 || equipPlace == 10) if (equipPlace == 9 || equipPlace == 10) { if (LocalSavePlaceArray[i] == 9 || LocalSavePlaceArray[i] == 10) { @@ -1011,7 +1008,7 @@ return true; } } } } return false; @@ -1053,13 +1050,13 @@ //public const int PLAYERSUMSTR_REDKEY = 102011001; public const int PLAYERSUMSTAR_REDKEY = 102011002; // public Redpoint redpointSTR = new Redpoint(MainRedDot.RedPoint_BagFuncKey, PLAYERSUMSTR_REDKEY); // public Redpoint redpointSTR = new Redpoint(MainRedDot.RedPoint_BagFuncKey, PLAYERSUMSTR_REDKEY); public Redpoint redpointSTAR = new Redpoint(MainRedDot.RedPoint_BagFuncKey, PLAYERSUMSTAR_REDKEY); public event Action<int, bool> RefreshAttrActiveAct; public void SetPlayerAttrActiveRedPoint() { if(IsActiveStarAttr()) if (IsActiveStarAttr()) { if (redpointSTAR.state != RedPointState.Simple) @@ -1100,7 +1097,7 @@ int nextActiveStars = 0; for (int i = 0; i < starslist.Count; i++) { if(cnt == 0) if (cnt == 0) { nextActiveStars = starslist[0]; break; @@ -1118,7 +1115,7 @@ } } if(nextActiveStars != 0 && playerSumStars >= nextActiveStars) if (nextActiveStars != 0 && playerSumStars >= nextActiveStars) { return true; } @@ -1144,7 +1141,7 @@ int nextActiveSTR = 0; for (int i = 0; i < strenlist.Count; i++) { if(cnt == 0) if (cnt == 0) { nextActiveSTR = int.Parse(strenlist[0]); break; @@ -1176,7 +1173,7 @@ { if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.EquipDecompose)) return; if(GetCanDevourModellist() != null && GetCanDevourModellist().Count >= minDevourEquipNum) if (GetCanDevourModellist() != null && GetCanDevourModellist().Count >= minDevourEquipNum) { redpointEquipDecom.state = RedPointState.Simple; } @@ -1218,7 +1215,7 @@ public event Action RefreshBagEvent; public void RefreshBagInfo() { if(RefreshBagEvent != null) if (RefreshBagEvent != null) { RefreshBagEvent(); } @@ -1228,7 +1225,7 @@ public void SetJumpToOneKeySell(Transform parent) { var goEffect = AchievementGuideEffectPool.Require(1); goEffect.transform.SetParentEx(parent,Vector3.zero,Quaternion.identity,Vector3.one); goEffect.transform.SetParentEx(parent, Vector3.zero, Quaternion.identity, Vector3.one); AchievementGoto.guideAchievementId = 0; } @@ -1274,7 +1271,7 @@ { if (!itemUseTypeDict.ContainsKey(skillConfig.SkillTypeID)) { itemUseTypeDict.Add(skillConfig.SkillTypeID,id); itemUseTypeDict.Add(skillConfig.SkillTypeID, id); } else { @@ -1306,7 +1303,7 @@ if (!dungeonUseDict.ContainsKey(mapId)) return; List<int> useIdlist = dungeonUseDict[mapId]; for(int i = 0; i < useIdlist.Count; i++) for (int i = 0; i < useIdlist.Count; i++) { int id = useIdlist[i]; AddItemUseTypeDict(id); @@ -1336,7 +1333,7 @@ #endregion #region 判断物品是否达到使用上限 public bool IsReachUseLimit(string guid,out ulong count) public bool IsReachUseLimit(string guid, out ulong count) { count = 0; ItemModel itemModel = GetItemModelByGUID(guid); @@ -1368,7 +1365,7 @@ } } if(count < (ulong)itemModel.itemInfo.ItemCount) if (count < (ulong)itemModel.itemInfo.ItemCount) { isReach = true; } @@ -1387,25 +1384,25 @@ public event Action RefreshEquipDecomNumAct; public int[] defaultUnSelectlist { get; private set; } public bool ContainPreciousItem(List<ItemModel> itemModels,out int betterEquipCnt,out int preciousCnt) public bool ContainPreciousItem(List<ItemModel> itemModels, out int betterEquipCnt, out int preciousCnt) { betterEquipCnt = 0; preciousCnt = 0; if (itemModels == null) return false; for(int i = 0; i < itemModels.Count; i++) for (int i = 0; i < itemModels.Count; i++) { if(defaultUnSelectlist.Contains(itemModels[i].itemId)) if (defaultUnSelectlist.Contains(itemModels[i].itemId)) { preciousCnt += itemModels[i].itemInfo.ItemCount; } else if(modelInterface.IsFightUp(itemModels[i].itemId,itemModels[i].equipScore) == 1) else if (modelInterface.IsFightUp(itemModels[i].itemId, itemModels[i].equipScore) == 1) { betterEquipCnt += itemModels[i].itemInfo.ItemCount; } } if(betterEquipCnt > 0 || preciousCnt > 0) if (betterEquipCnt > 0 || preciousCnt > 0) { return true; } @@ -1419,7 +1416,7 @@ if (itemModels == null) return false; for (int i = 0; i < itemModels.Count; i++) { if(itemModels[i].chinItemModel.StarLevel >= 2 && itemModels[i].chinItemModel.ItemColor >= (int)E_ItemColor.Orange) if (itemModels[i].chinItemModel.StarLevel >= 2 && itemModels[i].chinItemModel.ItemColor >= (int)E_ItemColor.Orange) { twoStarEquipCnt += itemModels[i].itemInfo.ItemCount; } @@ -1436,7 +1433,7 @@ colorType = type; if (colorType == EquipColorType.None) { if(lvType != EquipLvType.None) if (lvType != EquipLvType.None) { SetLvSelect(EquipLvType.None); } @@ -1481,7 +1478,7 @@ SendEquipDevourRecordQuest(); EquipDecomRedCtrl(); } public void SetStarSelect(EquipStarType type) { starType = type; @@ -1495,13 +1492,13 @@ public List<int> devourPlacelist { get; private set; } public int MaxDevourEquipNum { get; private set; } public int minDevourEquipNum { get; private set;} public int minDevourEquipNum { get; private set; } public void SetDevourEquipPlace() { devourPlacelist = new List<int>(); FuncConfigConfig funcConfig = Config.Instance.Get<FuncConfigConfig>("PetAbsorbType"); int[] placeArray = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical1); for(int i = 0; i < placeArray.Length;i++ ) for (int i = 0; i < placeArray.Length; i++) { devourPlacelist.Add(placeArray[i]); } @@ -1520,7 +1517,7 @@ orderDevourModellist.Clear(); foreach (var model in singlePack.GetPackModelIndexDict().Values) { if(model.chinItemModel.Type == 29) if (model.chinItemModel.Type == 29) { devourModellist.Add(model); } @@ -1534,7 +1531,7 @@ } } } } orderDevourModellist.AddRange(devourModellist); orderDevourModellist.Sort(CompareByColor); @@ -1573,12 +1570,12 @@ } return null; } foreach (var model in singlePack.GetPackModelIndexDict().Values) { if(model.chinItemModel.Type == 29) if (model.chinItemModel.Type == 29) { if(!defaultUnSelectlist.Contains(model.itemId)) if (!defaultUnSelectlist.Contains(model.itemId)) { canDevourModellist.Add(model); } @@ -1592,7 +1589,7 @@ } } if(RefreshEquipDecomNumAct != null) if (RefreshEquipDecomNumAct != null) { RefreshEquipDecomNumAct(); } @@ -1605,7 +1602,7 @@ { if (model.chinItemModel.ItemColor >= (int)E_ItemColor.Purple) { PetEatEquipConfig eatEquipConfig = PetEatEquipConfig.GetEquipColorAndEquipClass(model.chinItemModel.ItemColor,model.chinItemModel.LV); PetEatEquipConfig eatEquipConfig = PetEatEquipConfig.GetEquipColorAndEquipClass(model.chinItemModel.ItemColor, model.chinItemModel.LV); if (eatEquipConfig == null) return false; if (modelInterface.IsFightUp(model.itemId, model.equipScore) != 1) @@ -1622,12 +1619,12 @@ return false; } public bool IsMaxDecomLv(int decomLv,out int realLv) public bool IsMaxDecomLv(int decomLv, out int realLv) { realLv = decomLv; List<EquipDeComposeConfig> decomlist = Config.Instance.GetAllValues<EquipDeComposeConfig>(); if(decomLv > decomlist[decomlist.Count-1].LV) if (decomLv > decomlist[decomlist.Count - 1].LV) { realLv = decomlist[decomlist.Count - 1].LV; return true; @@ -1652,7 +1649,7 @@ { if (model == null) return; if(CheckIsReachDevourCondi(model)) if (CheckIsReachDevourCondi(model)) { selectDevourlist.Add(model); if (RefreshEquipDecomNumAct != null) @@ -1691,10 +1688,10 @@ } return false; } public void RemoveSelectDevourModellist(ItemModel model) { if(selectDevourlist.Contains(model)) if (selectDevourlist.Contains(model)) { selectDevourlist.Remove(model); } @@ -1704,9 +1701,9 @@ } } public Dictionary<int,int> GetDecomAttrDictByLv(int decomLv) public Dictionary<int, int> GetDecomAttrDictByLv(int decomLv) { if(decomposeAttrDict.ContainsKey(decomLv)) if (decomposeAttrDict.ContainsKey(decomLv)) { return decomposeAttrDict[decomLv]; } @@ -1717,7 +1714,7 @@ public bool IsReachMinDecomposeNum() { List<ItemModel> itemModels = GetCanDevourModellist(); if(itemModels != null && itemModels.Count >= minDecomposeNum) if (itemModels != null && itemModels.Count >= minDecomposeNum) { return true; } @@ -1739,7 +1736,7 @@ { _petIndex[i] = (ushort)itemModels[i].itemInfo.ItemPlace; idlist[i] = (uint)itemModels[i].itemId; if (itemModels[i].chinItemModel.StarLevel >= 2 if (itemModels[i].chinItemModel.StarLevel >= 2 || (itemModels[i].chinItemModel.EquipPlace == 0 && itemModels[i].chinItemModel.Type != 29)) { return; @@ -1754,7 +1751,7 @@ public void SendEquipDevourRecordQuest() { string record = StringUtility.Contact((int)colorType + 1,(int)lvType + 1,(int)starType + 1); string record = StringUtility.Contact((int)colorType + 1, (int)lvType + 1, (int)starType + 1); CA32D_tagCMDecomposeSeting decomSet = new CA32D_tagCMDecomposeSeting(); decomSet.Seting = uint.Parse(record); GameNetSystem.Instance.SendInfo(decomSet); @@ -1762,10 +1759,10 @@ public int decomposeLv { get; private set; } public int decomposeExp { get; private set; } public int decomposeProgress { get; private set; } public int addDecomposeExp { get; private set;} public int addDecomposeExp { get; private set; } public int minDecomposeNum { get; private set; } public bool isAutoDecompose { get;set; } public int recordAutoDecomNum { get; private set;} public bool isAutoDecompose { get; set; } public int recordAutoDecomNum { get; private set; } public DecomposeGetMatInfo[] getItems { get; private set; } public event Action RefreshDecomAttrAct; @@ -1773,21 +1770,21 @@ { addDecomposeExp = 0; int realLv = info.LV + 1; bool isMax = IsMaxDecomLv(realLv,out realLv); bool isMax = IsMaxDecomLv(realLv, out realLv); if (realLv == decomposeLv) { addDecomposeExp = (int)info.Exp - decomposeExp; } else { for(int i = decomposeLv; i <= realLv; i++ ) for (int i = decomposeLv; i <= realLv; i++) { EquipDeComposeConfig deComposeConfig = Config.Instance.Get<EquipDeComposeConfig>(i); if (i == decomposeLv) { addDecomposeExp = deComposeConfig.UpNeedExp - decomposeExp; } else if(i == realLv) else if (i == realLv) { addDecomposeExp += (int)info.Exp; } @@ -1812,7 +1809,7 @@ string lvStr = decomSetStr.Substring(1, decomSetStr.Length - 2); lvType = (EquipLvType)(int.Parse(lvStr) - 1); } if(RefreshDecomAttrAct != null) if (RefreshDecomAttrAct != null) { RefreshDecomAttrAct(); } @@ -1822,16 +1819,16 @@ /// </summary> /// <param name="getMatInfos"></param> /// <returns></returns> private List<DecomposeGetMatInfo> getMatInfos = new List<DecomposeGetMatInfo>(); private List<DecomposeGetMatInfo> getMatInfos = new List<DecomposeGetMatInfo>(); public List<DecomposeGetMatInfo> SetShowMatInfo() { getMatInfos.Clear(); int sumMatCnt = 0; if(getItems != null) if (getItems != null) { for(int i = 0; i < getItems.Length; i++) for (int i = 0; i < getItems.Length; i++) { if(getItems[i].Count > 0) if (getItems[i].Count > 0) { sumMatCnt += getItems[i].Count; } @@ -1842,7 +1839,7 @@ } } if(sumMatCnt > 5) if (sumMatCnt > 5) { for (int i = 0; i < getItems.Length; i++) { @@ -1857,7 +1854,7 @@ { if (getItems[i].Count > 0) { for(int j = 0; j < getItems[i].Count; j++) for (int j = 0; j < getItems[i].Count; j++) { DecomposeGetMatInfo matInfo = new DecomposeGetMatInfo(); matInfo.ItemID = getItems[i].ItemID; @@ -1957,9 +1954,9 @@ haveDruglist.Clear(); drugOrderlist.AddRange(makeDruglist); drugOrderlist.Sort(CompareByIsHave); for(int i = 0; i < drugOrderlist.Count; i++) for (int i = 0; i < drugOrderlist.Count; i++) { if(IsHaveDrugUse(drugOrderlist[i])) if (IsHaveDrugUse(drugOrderlist[i])) { haveDruglist.Add(drugOrderlist[i]); } @@ -1969,15 +1966,15 @@ { drugOrderlist[i] = haveDruglist[i]; } return drugOrderlist; } public bool CheckIsDrugById(int itemId) { for(int i = 0; i < makeDruglist.Count; i++) for (int i = 0; i < makeDruglist.Count; i++) { if(makeDruglist[i].ID == itemId) if (makeDruglist[i].ID == itemId) { return true; } @@ -1995,7 +1992,7 @@ //isHaveEnd = IsHaveDrugRecycle(end); //if (isHaveStart.CompareTo(isHaveEnd) != 0) return -isHaveStart.CompareTo(isHaveEnd); isHaveStart = GetItemCountByID(PackType.rptItem,start.ID) > 0 ? true : false; isHaveStart = GetItemCountByID(PackType.rptItem, start.ID) > 0 ? true : false; isHaveEnd = GetItemCountByID(PackType.rptItem, end.ID) > 0 ? true : false; if (isHaveStart.CompareTo(isHaveEnd) != 0) return isHaveStart.CompareTo(isHaveEnd); @@ -2011,7 +2008,7 @@ public bool IsHaveDrugUse(AttrFruitConfig fruitConfig) { if(!IsReachMaxUseDrug(fruitConfig)) if (!IsReachMaxUseDrug(fruitConfig)) { return GetItemCountByID(PackType.rptItem, fruitConfig.ID) > 0 ? true : false; } @@ -2033,7 +2030,7 @@ if (fruitConfig == null) return false; int useNum = GetSumUseCntByID(fruitConfig.ID); if(useNum >= fruitConfig.MaxUseCnt) if (useNum >= fruitConfig.MaxUseCnt) { return true; } @@ -2049,17 +2046,17 @@ for (int i = 0; i < previewDanlist.Count; i++) { AttrFruitConfig fruitConfig = Config.Instance.Get<AttrFruitConfig>(previewDanlist[i]); if(fruitConfig != null) if (fruitConfig != null) { limitlist.Add(fruitConfig); } } for(int i = 0; i < limitlist.Count; i++) for (int i = 0; i < limitlist.Count; i++) { progress += ((float)1 / limitlist.Count) *((float)GetSumUseCntByID(limitlist[i].ID)/limitlist[i].MaxUseCnt); progress += ((float)1 / limitlist.Count) * ((float)GetSumUseCntByID(limitlist[i].ID) / limitlist[i].MaxUseCnt); } return progress*100; return progress * 100; } #endregion }
