Commit Graph

260 Commits (d3e6de38bb7633cae5c4543316d5da72894eb16f)

Author SHA1 Message Date
jiaoyangna 04a1dacedd 四灵bug 修改 2021-03-01 10:19:48 +08:00
jiaoyangna bc2d95ddec 四灵 提交 2021-02-26 17:44:13 +08:00
jiaoyangna fdf9a1c913 四邻bug 修改 2021-02-22 20:25:58 +08:00
jiaoyangna 45549c8a6d 回放修改 2021-02-22 18:51:41 +08:00
jiaoyangna 6d1d7c7996 战斗回放类型修改 2021-02-22 18:42:26 +08:00
jiaoyangna c8a2308b00 四灵协议提交 2021-02-03 18:40:26 +08:00
jiaoyangna 8e0047d5e8 Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
2021-01-26 14:48:06 +08:00
jiaoyangna aa8989ae73 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-01-21 13:44:23 +08:00
jiaoyangna 841e1e5bf5 【ID1012358】
【tips】拥有永久皮肤后再使用皮肤提示信息异常需要优化
2021-01-21 13:44:19 +08:00
zhangqiang fc167398d6 【神将】神将上限999,继续通过碎片合成会导致游戏崩溃 2021-01-21 11:10:29 +08:00
zhangqiang f6b4a710c8 【战斗回放】大闹天宫战斗后,在森罗幻境中查看战斗回放,播放的是大闹天宫回放 2021-01-18 15:50:56 +08:00
zhangqiang 2d8cf57a08 【车迟斗法】战斗后bug 2021-01-18 15:11:27 +08:00
DESKTOP-98AVA47\Administrator c57a5ec8eb 【巅峰赛头像框修改】 2021-01-18 10:33:32 +08:00
gaoxin 3cbc165cf5 【森罗幻境】我方角色全部死亡,点击回春散使用按钮报错 2021-01-16 16:23:24 +08:00
DESKTOP-98AVA47\Administrator 8f437f407d 【本周优化修改】 2021-01-15 22:11:38 +08:00
DESKTOP-98AVA47\Administrator 040971534e 【巅峰赛限时头像修改】 2021-01-15 21:06:48 +08:00
jiaoyangna d443fe2233 【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
2021-01-15 15:27:21 +08:00
jiaoyangna 4ec81d52f4 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-01-15 10:50:32 +08:00
jiaoyangna 7666faad78 【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
2021-01-15 10:50:27 +08:00
ZhangBiao 5ffab2b82a 【跳转返回】道具跳转后返回关闭道具详情界面 2021-01-14 17:07:45 +08:00
jiaoyangna 3a7324883e 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 2021-01-14 15:24:51 +08:00
jiaoyangna 76765a51a4 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-01-12 19:21:27 +08:00
jiaoyangna be993c9905 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 2021-01-12 19:21:20 +08:00
zhangqiang 54c44d2983 【大闹天宫】已通关试炼节点,小人没往前走,或者挑战贪婪节点失败 2021-01-12 14:42:07 +08:00
zhangqiang e90509b0ae 【战斗回放】 强制引导屏蔽回放按钮 2021-01-12 11:19:10 +08:00
zhangqiang 8d5d222639 【战斗回放】 强制新手引导屏蔽按钮 2021-01-11 19:44:59 +08:00
jiaoyangna 6dbc555860 【战斗回放】按钮显示修改 2021-01-08 11:16:22 +08:00
jiaoyangna dadda1ed7d Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-01-07 20:48:21 +08:00
jiaoyangna a5a93d43a7 【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
2021-01-07 19:24:04 +08:00
zhangqiang ecbde627e4 【战斗回放】bug 2021-01-07 18:03:57 +08:00
zhangqiang 1ef5728daf 【战斗回放】代码整理 2021-01-07 11:32:26 +08:00
zhangqiang 9cf814590a 【战斗回放】车迟 十绝阵 2021-01-06 21:04:37 +08:00
zhangqiang 7bedefc780 【战斗回放】 2021-01-06 16:12:54 +08:00
ZhangBiao 289177dba2 【0106抽卡修复】普通抽卡报错修复
(cherry picked from commit 254b22a75a893eaf9b1e792b83881e61f8e43d0f)
(cherry picked from commit 524e502773)
2021-01-06 14:07:16 +08:00
zhangqiang 33a7491279 【bug】 2021-01-04 16:47:04 +08:00
jiaoyangna c1c15d6c8b 四灵试炼 2021-01-04 11:39:58 +08:00
zhangqiang 694320d99c Merge branch '0功能/1月6_版本优化' into master_develop
# Conflicts:
#	Assets/Effect_ls_08_jinwu_attack_02.controller.meta
#	Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi/ArtFont.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_banner.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon2.png.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation/GameObject 7.controller.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture.meta
#	Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller
#	Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller.meta
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	FontArt/ArtFont_zh/s_shengxingyouli_anniu_01_zh.png
#	FontArt/ArtFont_zh/s_shengxingyouli_anniu_02_zh.png
#	FontArt/中英文不一致资源/zh/s_shengxingyouli_banner_zh.png
2020-12-31 14:53:17 +08:00
zhangqiang b3bd8f8fa6 【漏提】 2020-12-30 18:20:32 +08:00
zhangqiang a6d16c13e5 【寻宝】加锁 2020-12-30 18:08:44 +08:00
jiaoyangna 0e8811df2b 【优化】背包中使用多个道具,明确标注数量 2020-12-30 11:02:44 +08:00
ZhangBiao 73aeaf3d89 【抽卡提示】六个抽卡分别加上妖晶提示 2020-12-29 14:24:45 +08:00
jiaoyangna a8bcdf14f4 【优化】道具不能使用0个,且优化道具使用多个的上限(目前20过少) 2020-12-28 20:10:45 +08:00
ZhangBiao 48e05b927d 【装备出售】装备出售数量可以无限叠加和叠减,修改 2020-12-28 16:14:46 +08:00
ZhangBiao becdc2dd88 【抽卡优化】连续十连或单抽也有确认提示 2020-12-28 15:46:22 +08:00
gaoxin bf6fd2d13d Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-12-26 20:22:23 +08:00
gaoxin 104505622a Merge branch 'gx/xma_local' into master_xma_local 2020-12-26 18:28:21 +08:00
ZhangBiao 3516c10cc6 [森罗环境] 扎小怪计入击杀奖励 2020-12-24 17:16:33 +08:00
ZhangBiao c5022043fd 【道具使用跳转】跳转后返回关闭弹窗界面
(cherry picked from commit 150ec3eb2f)
2020-12-24 16:43:37 +08:00
guowei f25f253479 【合成优化修改】 2020-12-24 15:03:14 +08:00
guowei df79f56b72 【优化五星成长礼包、心魔试炼礼包】 2020-12-24 13:52:28 +08:00