Commit Graph

264 Commits (febcd00a5feddcb6ccb2f9ed37a19b3aac596f33)

Author SHA1 Message Date
gaoxin 5ab9688089 Merge branch 'master_xma_local' into master_develop 2020-11-16 16:46:33 +08:00
ZhangBiao 9601af33e7 【神将详情】排行榜查看他人装备显示出售按钮修复 2020-11-16 16:20:15 +08:00
ZhangBiao 8df6de20e5 【副本】isInMap字段删除bug修复 2020-11-16 15:24:09 +08:00
ZhangBiao c2933ddb96 Merge branch '0活动开发聚集地/灵兽抽卡(可更换兽)' into master_develop
# Conflicts:
#	Assets/ManagedResources/BG/lingshou_lingshoubeijing_03.jpg.meta
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
2020-11-13 14:20:49 +08:00
ZhangBiao 8a5d51e2a3 【灵兽抽卡】增加可选灵兽
(cherry picked from commit 8185be7c27)
2020-11-13 12:12:44 +08:00
ZhangBiao 8185be7c27 【灵兽抽卡】增加可选灵兽 2020-11-13 12:12:06 +08:00
zhangqiang 492d969a4f 【觉醒】bug 修改 公会成员灵兽显示错误 2020-11-12 14:38:40 +08:00
zhangqiang a5f744261b 【觉醒】bug 修改 公会成员灵兽显示错误 2020-11-12 14:38:01 +08:00
zhangqiang 0ca5e4ea13 【觉醒】bug 2020-11-11 20:21:37 +08:00
zhangqiang 82a2d14bb6 【觉醒】bug 2020-11-11 20:19:54 +08:00
ZhangBiao 82dc9fac73 【易经宝库】第三层抽取完成后bug修复
(cherry picked from commit 9ca403ebff)
2020-11-09 11:12:28 +08:00
ZhangBiao 9ca403ebff 【易经宝库】第三层抽取完成后bug修复 2020-11-09 11:09:42 +08:00
jiaoyangna 351785e3fc Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2020-11-06 21:11:18 +08:00
jiaoyangna 98ff210ae2 皮肤解锁提示 2020-11-06 20:21:20 +08:00
gaoxin 53b6f4483f Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_yl_vo_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_zl_vo_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh03.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_hd01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_ql01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl02.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl03.mp3.meta
#	Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png.meta
#	Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2020-11-06 19:56:52 +08:00
jiaoyangna bd92d5339d Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 19:54:49 +08:00
jiaoyangna 22038419b7 神医天降提交 2020-11-06 19:54:00 +08:00
wangzhenxing 5128a02eba [皮肤] 胜利最佳输出界面显示皮肤 2020-11-06 17:58:28 +08:00
wangzhenxing 04deaa28d6 [皮肤] 胜利最佳输出界面显示皮肤 2020-11-06 17:52:54 +09:00
ZhangBiao 73c94dee90 Merge branch '0活动开发聚集地/易经宝库' into master_develop
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-11-06 17:34:27 +08:00
ZhangBiao 5e130a7585 Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-11-06 16:17:12 +08:00
ZhangBiao b516a8c202 【易经宝库】没有QA 无法购买 2020-11-06 13:36:48 +08:00
jiaoyangna be7be732d3 Merge branch 'master_develop' into 0功能/皮肤
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
2020-11-06 10:54:04 +08:00
jiaoyangna e2fae0cc52 皮肤提交 2020-11-06 09:37:27 +08:00
ZhangBiao 6f75850ae4 【易经宝库】提交 2020-11-05 19:10:20 +08:00
jiaoyangna 5026bdd0c3 【皮肤】提交 2020-11-05 16:02:49 +08:00
jiaoyangna 3bc2b74ce5 皮肤分解提交 2020-11-05 14:18:32 +08:00
jiaoyangna 360727419e 【皮肤】修改皮肤显示 2020-11-04 16:51:45 +08:00
gaoxin 8b74daae36 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-04 16:18:42 +08:00
gaoxin 1c25e4e21a Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/LuaFramework/Scenes/LogoHwRelease_IOS.unity.meta
#	Assets/LuaFramework/Scenes/LogoHwTest_IOS.unity.meta
#	Assets/LuaFramework/Scripts/Framework/App.cs
#	Assets/LuaFramework/Scripts/Manager/NetworkManager.cs
#	Assets/LuaFramework/Scripts/Network/SocketClient.cs
#	Assets/ManagedResources/Atlas/DemonSlayerAtlas.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_banner.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_icon1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_icon2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_zi.png.meta
#	Assets/ManagedResources/Atlas/VipAtlas/ArtFont/t_tequan_xiaoyao.png.meta
#	Assets/ManagedResources/Audio/UI/common/UI_shaizi.mp3
#	Assets/ManagedResources/DynamicAtlas/ArtFont/g_gonghui_banner.png.meta
#	Assets/ManagedResources/DynamicAtlas/ArtFont/r_daren_xubao1.png.meta
#	Assets/ManagedResources/DynamicAtlas/ArtFont/r_daren_xubao3.png.meta
#	Assets/ManagedResources/DynamicAtlas/Skill/l_ls_11.png.meta
#	Assets/ManagedResources/EffectResSkill.meta
#	Assets/ManagedResources/EffectResUI.meta
#	Assets/ManagedResources/EffectResUI/PokemonEgg/Prefab/Effect_Dan_changzhu.prefab
#	Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_BaiHu.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_Lanlong.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_QingLong.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DemonSlayer.meta
#	Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSingleResultPanel.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/SoundData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua.meta
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleSetView.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua.meta
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua.meta
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-11-04 16:18:35 +08:00
zhangqiang 750a87c168 【魂印】 线上首次打开神将魂印界面有时会弹出战力变化 修改 2020-11-04 15:04:18 +08:00
jiaoyangna 509357e333 Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2020-11-04 10:54:54 +08:00
jiaoyangna 1fcdf5b2a6 【皮肤】添加皮肤属性加成 2020-11-03 19:37:05 +08:00
jiaoyangna e92e63444b 皮肤提交 2020-11-03 17:27:32 +08:00
zhangqiang 4cb30990e1 【灵兽系统】 bug 需同步 2020-11-02 11:52:00 +08:00
zhangqiang c206f6487e 【灵兽系统】 漏合 2020-11-02 10:59:17 +08:00
zhangqiang 3479bd153c 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
zhangqiang 005f36c524 【灵兽系统】 修改bug 2020-10-31 14:49:58 +08:00
zhangqiang 4f25b8cc98 【灵兽系统】 修改bug 2020-10-30 17:48:49 +08:00
zhangqiang 36d1d84cce 【大闹天宫】 试炼节点 战斗结束掉英雄报错卡死 2020-10-30 10:28:20 +08:00
zhangqiang 018c571a93 【大闹天宫】 试炼节点 战斗结束掉英雄报错卡死 2020-10-30 10:27:57 +08:00
wangzhenxing 09cd47db46 【灵兽】bug修改 buffctr 报错修改 2020-10-29 11:18:11 +09:00
wangzhenxing 0b9efcdd69 灵兽bug修改提交 2020-10-28 18:08:56 +09:00
wangzhenxing b108d3bc85 灵兽bug修改 2020-10-28 16:30:12 +09:00
zhangqiang 7e7316c52c 【灵兽系统】 星际修改 2020-10-28 10:50:16 +08:00
wangzhenxing 132c49a807 [灵兽] 灵兽策划反馈bug修改 2020-10-28 10:17:20 +09:00
zhangqiang 0d9ed28c23 【灵兽系统】 资源替换 拖拽修改 2020-10-27 15:59:53 +08:00
zhangqiang f2151b12fb 【灵兽系统】 主城挪位置 合成最大限制 2020-10-27 10:26:31 +08:00
wangzhenxing f3d5640893 人物信息显示详情修改 2020-10-26 19:04:56 +09:00
wangzhenxing c5b97f3cda 灵兽去除log 2020-10-26 16:42:48 +09:00