Commit Graph

2868 Commits (6f0e3deebbec3e39f3b9e965d925f31a4b0608d4)

Author SHA1 Message Date
JieLing 3722a9a3f2 Merge branch 'master_xma_local' into master_xma_test 2021-01-05 16:33:42 +08:00
ZhangBiao 7cb9252f45 【礼包刷新】修复礼包刷新问题 2021-01-05 16:29:13 +08:00
guowei 8a3eb5aab8 【鸿蒙阵成就补充】 2021-01-05 14:26:26 +08:00
JieLing 03cdc9cf55 Merge branch 'master_xma_test' into gx/test_new
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
2021-01-05 14:23:00 +08:00
guowei 4d951b38bd 【鸿蒙阵成就】 2021-01-05 10:46:35 +08:00
Fuhaifeng 3819ed162a //确保 关闭Client的链接状态。 2021-01-04 19:41:01 +08:00
guowei 94f549f605 【鸿蒙阵成就 任务】 2021-01-04 19:40:39 +08:00
Fuhaifeng fd7f19c8ec 偶尔出现的 同设备登录BUG, 通过SocketClient重新链接后的的安全甄别 2021-01-04 18:53:46 +08:00
JieLing 2c15faa4a4 【森罗】跳转 2021-01-04 18:29:41 +08:00
JieLing b995971610 【森罗】跳转 2021-01-04 18:29:20 +08:00
JieLing 8c7c3f5cee Merge branch 'master_xma_local' into master_xma_test 2021-01-04 18:14:16 +08:00
JieLing cdd6f979c8 【狭路相逢】资源调整位置 2021-01-04 18:13:16 +08:00
ZhangBiao 70a85609df 【无尽副本】报错修改
(cherry picked from commit 43cfaf3d1054adca7f6284a0de38c2383678aa6e)
2021-01-04 17:00:24 +08:00
zhangqiang 33a7491279 【bug】 2021-01-04 16:47:04 +08:00
guowei 6fe2339153 【鸿蒙阵需求修改】 2021-01-04 16:31:46 +08:00
ZhangBiao 71c18b1e94 狭路相逢 2021-01-04 15:52:13 +08:00
guowei cc337cbcb3 【鸿蒙阵】 2021-01-04 15:27:19 +08:00
ZhangBiao 8187dce467 狭路相逢 2021-01-04 15:21:46 +08:00
ZhangBiao 74cec8e7b4 【无尽副本】偶现卡死尝试修改 2021-01-04 15:13:21 +08:00
ZhangBiao dfafed683d 【乾坤宝盒】点击商店报错修改 2021-01-04 15:04:24 +08:00
ZhangBiao 2fed5ddb45 【森罗幻境】进入森罗幻境后直接关闭选择神将弹窗,会在离开幻境前闪过一个统计弹窗 修复 2021-01-04 11:04:37 +08:00
ZhangBiao fc8f74cd3a 【森罗幻境】在进入下一层后,下方的神将头像位置会发生变化 修复 2021-01-04 10:41:35 +08:00
guowei 30b0c26a6e 【鸿蒙阵】 2021-01-04 09:57:42 +08:00
ZhangBiao 667adb2ba1 【资源替换】重置界面妖晶资源替换 2020-12-31 17:18:37 +08:00
zhangqiang 997aaff78f 【寻宝加锁】提示 2020-12-31 16:20:05 +08:00
jiaoyangna d249a4c0c1 【优化】挂机宝箱显示当前的挂机时间 2020-12-31 15:55:20 +08:00
zhangqiang ec81feaa06 【公会技能】长按升级bug 2020-12-31 15:53:05 +08:00
zhangqiang 7402a7ce6c 【工會技能】长按升级bug 2020-12-31 15:29:08 +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
jiaoyangna 44951a3766 [战斗] ====优化伤害,中毒燃烧数字显示速度 2020-12-31 14:14:56 +08:00
JieLing b1cd14be3e Merge branch 'master_xma_local' into master_xma_test 2020-12-31 13:51:33 +08:00
ZhangBiao 853b541fb5 【抽卡提示】六个抽卡分别加上妖晶提示
(cherry picked from commit 73aeaf3d89)
(cherry picked from commit 56cf5e10600a72ca635592f4ae6a2298542c7cc9)
2020-12-31 10:50:14 +08:00
ZhangBiao 3280394186 【抽卡优化】连续十连或单抽也有确认提示
(cherry picked from commit becdc2dd88)
(cherry picked from commit 47378d9c50b36d9576a88dccb66016f2ca10127b)
2020-12-31 10:49:39 +08:00
JieLing a1d52ccac0 【优化】优化公会和编队列表刷新规则 2020-12-30 20:27:26 +08:00
JieLing af7e202ea9 【优化】部分界面动画效果优化 2020-12-30 19:51:14 +08:00
zhangqiang 0a2b4f3c3e 【漏提】 2020-12-30 18:25:48 +08:00
zhangqiang b3bd8f8fa6 【漏提】 2020-12-30 18:20:32 +08:00
jiaoyangna 3fa2f1b7f8 Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-30 18:17:39 +08:00
jiaoyangna 21321eeede 【优化】修改四灵阵界面的宣传人物图片 2020-12-30 18:17:26 +08:00
zhangqiang a6d16c13e5 【寻宝】加锁 2020-12-30 18:08:44 +08:00
JieLing 83fa0d7f85 【优化】热更新界面显示优化 2020-12-30 17:24:43 +08:00
JieLing 1b6c9e6515 【反沉迷提示】还外包删除防沉迷提示 2020-12-30 17:24:06 +08:00
JieLing 4d983406f3 【bug】修复魂印穿戴报错 2020-12-30 17:03:12 +08:00
JieLing e8ea367a6e 【优化】scrollview setData不是回到顶部时不再播放动画 2020-12-30 16:45:52 +08:00
jiaoyangna 223c23f4bd [狭路相逢] 提交 2020-12-30 15:56:11 +08:00
JieLing ef3c269876 【优化】scrollview SetData接口默认回到顶部 2020-12-30 15:55:46 +08:00
JieLing fca9bfccfc 【优化】修复周月礼包不显示在最上面 2020-12-30 15:04:30 +08:00
guowei 544be95060 【预制体修改】 2020-12-30 14:51:16 +08:00
guowei a24850e51b 【鸿蒙阵修改】 2020-12-30 14:50:38 +08:00
JieLing f3c1a2297a 【bug】修复scrollview修改导致引导报错的问题 2020-12-30 14:41:27 +08:00
JieLing 15099f1e09 【修复】寻宝界面显示错误 2020-12-30 14:26:37 +08:00
jiaoyangna 186906ed2c 灵兽宝阁假战斗id修改为读GlobalActivity表的ExpertDec 这一列 2020-12-30 11:21:13 +08:00
jiaoyangna 0e8811df2b 【优化】背包中使用多个道具,明确标注数量 2020-12-30 11:02:44 +08:00
jiaoyangna 2e6cdb5014 【优化】背包中使用多个道具,明确标注数量 2020-12-30 10:34:06 +08:00
gaoxin 5c69617c48 【优化】ui管理删除多余的层级管理 2020-12-29 20:46:03 +08:00
gaoxin 816351d73e 【优化】网络层优化-峰哥 2020-12-29 20:45:56 +08:00
gaoxin 9f691e4e05 【优化】scrollview分帧加载-游戏内适应性修改 2020-12-29 20:37:57 +08:00
guowei ca9a6a933b 【鸿蒙阵修改】 2020-12-29 20:36:37 +08:00
gaoxin 962c41e11c 【优化】scrollview改为分帧加载 2020-12-29 20:35:28 +08:00
zhangqiang c79285e4ca 【竞技场】在线等待赛季刷新,攻击次数奖励异常-dev 2020-12-29 17:36:01 +08:00
zhangqiang 739f390115 Merge branch 'master_xma_local' into 0功能/1月6_版本优化
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
2020-12-29 17:00:08 +08:00
zhangqiang 1227e93456 【寻宝】 优化 加锁 1 2020-12-29 16:56:18 +08:00
zhangqiang 35f211a2a4 【工会技能】 优化 连续升级 2020-12-29 16:15:11 +08:00
JieLing 650de3dc74 Merge branch 'master_xma_local' into master_xma_test 2020-12-29 15:57:39 +08:00
ZhangBiao c84656e705 【降妖夺宝】取消抽卡前摇 2020-12-29 14:51:30 +08:00
ZhangBiao 99d574ba27 Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-29 14:24:55 +08:00
ZhangBiao 73aeaf3d89 【抽卡提示】六个抽卡分别加上妖晶提示 2020-12-29 14:24:45 +08:00
jiaoyangna 1cf3f17888 【优化】神将解锁锁定状态基本看不出来,让其更加明显 2020-12-29 14:23:53 +08:00
zhangqiang 2576c5bcdd 【新将来袭】banner 图片替换 2020-12-29 12:13:29 +08:00
jiaoyangna fffb834f8a 【优化】挂机宝箱显示当前的挂机时间 2020-12-29 11:26:34 +08:00
ZhangBiao 5137e588dc Revert "【关卡界面】怎加挂机时间"
This reverts commit 136b2a4c18.
2020-12-29 10:53:48 +08:00
jiaoyangna fa46595132 Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-29 10:35:35 +08:00
jiaoyangna d389cb93f5 【优化】背包分类优化 2020-12-29 10:33:45 +08:00
ZhangBiao 927aa7053b .进入无尽副本上阵阵容之后推出副本,在挑战关卡、神将-编队无法上三星及以下英雄(不显示) 2020-12-29 10:28:10 +08:00
ZhangBiao 574a0da116 【编队】进入无尽副本后 主线编队无法上阵20级以下英雄修复 2020-12-29 10:24:50 +08:00
jiaoyangna 19d984a641 【优化】背包分类优化 2020-12-28 21:08:25 +08:00
jiaoyangna eba0a867da Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-28 20:10:50 +08:00
jiaoyangna a8bcdf14f4 【优化】道具不能使用0个,且优化道具使用多个的上限(目前20过少) 2020-12-28 20:10:45 +08:00
JieLing 7ee7fc42d7 【资源修改】 2020-12-28 20:05:15 +08:00
JieLing d86c2dc822 【资源修改】 2020-12-28 20:04:59 +08:00
guowei 4939dd69b8 【鸿蒙阵修改】 2020-12-28 20:02:36 +08:00
JieLing d4862c1064 Merge branch 'master_xma_local' into master_xma_test 2020-12-28 19:49:46 +08:00
ZhangBiao 136b2a4c18 【关卡界面】怎加挂机时间 2020-12-28 19:46:50 +08:00
zhangqiang f2ac961e39 【提交】 2020-12-28 19:46:44 +08:00
zhangqiang 66e2b0b25d 【新将来袭】资源引用丢失 2020-12-28 19:41:17 +08:00
JieLing 91cfcb8ccd 【资源文件夹】 2020-12-28 19:28:05 +08:00
JieLing f799c5432c 【资源调整】2 2020-12-28 18:59:53 +08:00
zhangqiang bbddb9e2ec 【资源调整】 2020-12-28 18:25:51 +08:00
ZhangBiao 9f3560471c Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-28 17:07:30 +08:00
ZhangBiao 56436bb4c3 【云梦祈福】1080*2460,重置按钮点击没反应 修改 2020-12-28 17:06:59 +08:00
jiaoyangna 2e3ac84814 【优化】背包中使用多个道具,明确标注数量 2020-12-28 16:40:32 +08:00
jiaoyangna 58111d30a2 Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-28 16:26:50 +08:00
jiaoyangna 02ac474504 【优化】背包分类优化 2020-12-28 16:26:38 +08:00
jiaoyangna d85bd9c3aa 【优化】背包分类优化 2020-12-28 16:25:38 +08:00
ZhangBiao 48e05b927d 【装备出售】装备出售数量可以无限叠加和叠减,修改 2020-12-28 16:14:46 +08:00
ZhangBiao 5a9ba48166 【限时折扣】错字 修改 2020-12-28 15:59:31 +08:00
zhangqiang 680d112657 【乾坤宝盒】 修改 2020-12-28 15:56:33 +08:00
ZhangBiao becdc2dd88 【抽卡优化】连续十连或单抽也有确认提示 2020-12-28 15:46:22 +08:00
ZhangBiao f7804d531a Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-28 15:19:56 +08:00
ZhangBiao c649621d85 【森罗幻境】下方头像顺序,后端把顺序换了 2020-12-28 15:19:46 +08:00
zhangqiang 9ecbe3b76d 【工会技能】 优化 把输出页签提前 2020-12-28 15:09:56 +08:00
guowei 3b3467d94b 【鸿蒙阵修改】 2020-12-28 14:33:30 +08:00
zhangqiang f553b7275d 【跨服天梯】世界等级 加空推送协议 2020-12-28 14:27:52 +08:00
guowei d55b0d58e9 【鸿蒙阵bug 修改】 2020-12-28 14:12:17 +08:00
zhangqiang 7729c433e7 【跨服天梯】加一个空推送 2020-12-28 13:56:06 +08:00
zhangqiang 46d090b509 【抽卡横线】去掉 2020-12-28 13:54:34 +08:00
guowei d989aa5b85 【鸿蒙阵bug修改】 2020-12-28 13:37:30 +08:00
ZhangBiao db910c2706 Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-28 11:59:47 +08:00
ZhangBiao b6037a00e3 【森罗幻境】奖励红点修改 2020-12-28 11:59:27 +08:00
jiaoyangna 9fc20a2663 Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-28 11:53:29 +08:00
jiaoyangna 82f3aff140 限时召唤报错修改 2020-12-28 11:53:07 +08:00
ZhangBiao 8a23b4da2d 【礼包购买】礼包购买刷新,小于1分钟时显示1分钟 2020-12-28 11:49:14 +08:00
ZhangBiao 263e5cd0f6 【森罗幻境】遇怪弹出的详情底部,猎妖师->神将 修改 2020-12-28 11:34:35 +08:00
ZhangBiao 95436e5710 【抽卡】没有动画 修改 2020-12-28 11:31:28 +08:00
wangzhenxing 4571f9e5a5 [战斗] 不灭buff更新修改提交 2020-12-28 12:11:03 +09:00
ZhangBiao 4010991f0d 【森罗幻境】奖励红点修改
(cherry picked from commit b6037a00e3)
(cherry picked from commit c2b399aa43e39dfd58a624ee27531ddbecbd4828)
2020-12-28 12:00:36 +08:00
ZhangBiao f35e941cf3 【抽卡】没有动画 修改
(cherry picked from commit 95436e5710)
(cherry picked from commit 1297c9cb18cc57626bd143a351bedc2fbc2c401d)
2020-12-28 11:50:59 +08:00
ZhangBiao 9d3b560c50 【主题活动】点击页签打开,第一个活动不是选中状态 2020-12-28 10:56:02 +08:00
gaoxin 2c6da4aaf0 【装备】装备出售界面文字显示修改 2020-12-28 10:46:26 +08:00
gaoxin ab7a389f6e 【装备】装备出售界面文字显示修改 2020-12-28 10:46:18 +08:00
guowei b406886f91 【鸿蒙阵bug修改】 2020-12-28 10:44:31 +08:00
jiaoyangna 0d40e26a34 副本红点修改 2020-12-28 10:03:24 +08:00
wangzhenxing 10156d63e6 【特效】混乱特效,删除冗余资源 2020-12-26 21:06:57 +08:00
ZhangBiao 5b22a0f671 【特效】混乱特效添加 2020-12-26 21:04:02 +08:00
ZhangBiao 9d0c6a30c2 【特效】混乱特效添加 2020-12-26 21:03:21 +08:00
gaoxin f2715c77bc 【特效】混乱特效资源文件缺失补齐 2020-12-26 20:39:31 +08:00
gaoxin f29b6518fa 【协议】误删恢复 2020-12-26 20:27:54 +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 9e67dcb248 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-12-26 19:57:14 +08:00
gaoxin f043773668 【资源】遗漏资源补齐 2020-12-26 19:56:59 +08:00
wangzhenxing ed9efaf4e8 【战斗】 白骨精追加普攻必定暴击修改 2020-12-26 19:54:46 +09:00
wangzhenxing fcc8724fca 【战斗】=====292被动位置修改 2020-12-26 19:52:51 +09:00
wangzhenxing 4bc92b8b21 [战斗]白骨精法宝添加普攻不触发任何特性 2020-12-26 19:49:45 +09:00
wangzhenxing e9c4cab292 [战斗]289被动修改,协议数据提交 2020-12-26 19:48:59 +09:00
wangzhenxing 8503667fc8 【战斗】==========混乱特效名称修改 2020-12-26 19:48:06 +09:00
wangzhenxing f07b8a14d2 [战斗]修改切磋判断胜负条件 2020-12-26 19:46:18 +09:00
wangzhenxing 96f31b63ad [优化]魂宝灵宝加号点击区域扩大 2020-12-26 19:45:44 +09:00
wangzhenxing e4596beb99 【宝物】==========宝物添加加号提示 2020-12-26 19:44:48 +09:00
wangzhenxing 8ad04c122c [优化] 巅峰争霸赛,切磋超时改为只判断总伤害,不再判断总治疗 2020-12-26 19:36:11 +09:00
wangzhenxing f0c2913433 [战斗] 修改初始怒气无法增加修改 2020-12-26 19:29:44 +09:00
wangzhenxing 064e00c029 [战斗]白骨精技能,被动,魂印效果提交 2020-12-26 19:28:29 +09:00
jiaoyangna f0f423bbd4 红点报错 修改 2020-12-26 18:40:28 +08:00
jiaoyangna c1f87eb208 逍遥红点 提交 2020-12-26 18:39:47 +08:00
gaoxin 1171415e74 【技能Tip】修复大小不能自适应文字的问题 2020-12-26 18:34:08 +08:00
gaoxin 7fe3b4f39f 【战斗】魂印力战之躯不再免疫间接伤害 2020-12-26 18:34:02 +08:00
gaoxin f548b3647a 【特效】金乌特效动画文件修改 2020-12-26 18:33:46 +08:00
gaoxin 741f7d0448 【特效】修复白骨精特效全屏显示 2020-12-26 18:33:11 +08:00
gaoxin bf4fbffe3d 【幸运探宝】修复奖池奖励显示错误 2020-12-26 18:33:04 +08:00
gaoxin f4b682db17 【资源】增加活动及系统需求图片资源 meta文件提交 2020-12-26 18:32:56 +08:00
liuyipeng 56ffc108b1 增加活动及系统需求图片资源 2020-12-26 18:32:14 +08:00