zhangqiang
|
ec07753463
|
【灵兽宝阁】再次收取提示修复
|
2021-01-09 11:01:19 +08:00 |
gaoxin
|
70a771db27
|
【战斗】优化战斗结束后报错的问题
|
2021-01-09 10:59:50 +08:00 |
gaoxin
|
7ae81ae694
|
【战斗】战斗开始技能报错,灵兽技能释放casting事件延长到2秒
|
2021-01-09 10:58:15 +08:00 |
wangzhenxing
|
f28ad49f3d
|
【战斗】 ==========表现优化敌我方死亡后不显示加怒气的表现
|
2021-01-08 19:51:26 +09:00 |
wangzhenxing
|
fce7a7ec32
|
[战斗]======前端战斗 英雄添加job数据
|
2021-01-08 19:19:25 +09:00 |
wangzhenxing
|
40be6b55d2
|
[战斗]=========新增125效果 -- 目标[a]增加[b]%持续[c]回合,效果可叠加,[d]改变
|
2021-01-08 18:15:28 +09:00 |
ZhangBiao
|
9d4ece5fcd
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-08 17:42:08 +08:00 |
ZhangBiao
|
f4d437c93b
|
【车迟斗法】boss位置调整3
|
2021-01-08 17:41:59 +08:00 |
zhangqiang
|
9251d5d133
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-08 17:35:26 +08:00 |
zhangqiang
|
97b298d7a2
|
Revert "【主题活动】部分活动未关闭试修复"
This reverts commit a779533517 .
|
2021-01-08 17:35:12 +08:00 |
ZhangBiao
|
526e2226fc
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-08 17:22:05 +08:00 |
ZhangBiao
|
9a0a80d17c
|
【车迟斗法】boss位置调整
|
2021-01-08 17:18:02 +08:00 |
wangzhenxing
|
503be01f18
|
【战斗】===========新增124效果 造成目标[a]*[b]%的直接伤害
|
2021-01-08 17:36:03 +09:00 |
wangzhenxing
|
6d86795403
|
[战斗]=====灵兽金乌技能修改提交
|
2021-01-08 16:36:55 +09:00 |
wangzhenxing
|
91531e00b0
|
[战斗]====提交 麒麟印记,放逐类型
|
2021-01-08 16:35:52 +09:00 |
wangzhenxing
|
8ce40e8099
|
[战斗]====添加5, 6 condition 判断条件 添加buff类型 麒麟印加 放逐
|
2021-01-08 16:34:42 +09: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 |
jiaoyangna
|
91e003e952
|
【ID1007772】
【优化】91, 车迟斗法BOSS每日更换,掉落不同奖励
|
2021-01-07 17:54:55 +08:00 |
jiaoyangna
|
6ae1a0b75e
|
【ID1007696】
【优化】逍遥游移动时头顶出现金币的奖励特效
|
2021-01-07 17:45:50 +08:00 |
jiaoyangna
|
d1a0b3f1df
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-07 16:22:44 +08:00 |
jiaoyangna
|
3cecf72861
|
铜墙铁壁
|
2021-01-07 16:22:36 +08:00 |
DESKTOP-98AVA47\Administrator
|
7339c1bbe5
|
【送神祀】优化修改
|
2021-01-07 14:39:27 +08:00 |
ZhangBiao
|
5a76c82d19
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-07 11:52:43 +08:00 |
ZhangBiao
|
a779533517
|
【主题活动】部分活动未关闭试修复
|
2021-01-07 11:52:19 +08:00 |
zhangqiang
|
1ef5728daf
|
【战斗回放】代码整理
|
2021-01-07 11:32:26 +08:00 |
ZhangBiao
|
510c18226a
|
【抽卡】降妖夺宝
(cherry picked from commit 06ec0f40eb )
|
2021-01-07 09:30:11 +08:00 |
ZhangBiao
|
9d88f435ab
|
【抽卡】降妖夺宝抽卡显示错误修改
(cherry picked from commit b960e57716 )
|
2021-01-07 09:30:05 +08:00 |
zhangqiang
|
9cf814590a
|
【战斗回放】车迟 十绝阵
|
2021-01-06 21:04:37 +08:00 |
ZhangBiao
|
29566b64bc
|
【降妖夺宝】取消抽卡前摇
(cherry picked from commit c84656e705 )
|
2021-01-06 17:34:08 +08:00 |
ZhangBiao
|
42559b2cee
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-06 17:31:05 +08:00 |
ZhangBiao
|
31c5aa7580
|
【森罗幻境】红点刷新修改
|
2021-01-06 17:30:48 +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 |
DESKTOP-98AVA47\Administrator
|
238c0706c0
|
【(送神祠)选择属性筛选后进行恭送神将、神将归元、法宝归元、宝物分解优化】
|
2021-01-05 14:29:33 +08:00 |
zhangqiang
|
c96aedc923
|
Merge branch 'master_xma_local' into 0功能/本周版本优化内容
|
2021-01-05 10:33:58 +08:00 |
JieLing
|
b995971610
|
【森罗】跳转
|
2021-01-04 18:29:20 +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 |
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 |
zhangqiang
|
ed65735dc5
|
【重置优化】将游戏中的各个玩法重置时间统一调整至0点
|
2021-01-04 14:27:18 +08:00 |
jiaoyangna
|
80229417d4
|
【优化】91, 车迟斗法BOSS每日更换,掉落不同奖励
|
2021-01-04 11:42:09 +08:00 |
ZhangBiao
|
2fed5ddb45
|
【森罗幻境】进入森罗幻境后直接关闭选择神将弹窗,会在离开幻境前闪过一个统计弹窗 修复
|
2021-01-04 11:04:37 +08:00 |
jiaoyangna
|
c66fdcf0ed
|
【优化】修改公会图腾功能
|
2021-01-04 10:49:44 +08:00 |
ZhangBiao
|
fc8f74cd3a
|
【森罗幻境】在进入下一层后,下方的神将头像位置会发生变化 修复
|
2021-01-04 10:41:35 +08:00 |
zhangqiang
|
997aaff78f
|
【寻宝加锁】提示
|
2020-12-31 16:20:05 +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 |
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 |
zhangqiang
|
b3bd8f8fa6
|
【漏提】
|
2020-12-30 18:20:32 +08:00 |
zhangqiang
|
a6d16c13e5
|
【寻宝】加锁
|
2020-12-30 18:08:44 +08:00 |
jiaoyangna
|
223c23f4bd
|
[狭路相逢] 提交
|
2020-12-30 15:56:11 +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 |
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 |
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 |
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 |
ZhangBiao
|
136b2a4c18
|
【关卡界面】怎加挂机时间
|
2020-12-28 19:46:50 +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 |
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 |
zhangqiang
|
f553b7275d
|
【跨服天梯】世界等级 加空推送协议
|
2020-12-28 14:27:52 +08:00 |
zhangqiang
|
7729c433e7
|
【跨服天梯】加一个空推送
|
2020-12-28 13:56:06 +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
|
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 |
jiaoyangna
|
0d40e26a34
|
副本红点修改
|
2020-12-28 10:03:24 +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 |
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
|
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
|
7fe3b4f39f
|
【战斗】魂印力战之躯不再免疫间接伤害
|
2020-12-26 18:34:02 +08:00 |
gaoxin
|
bf4fbffe3d
|
【幸运探宝】修复奖池奖励显示错误
|
2020-12-26 18:33:04 +08:00 |
gaoxin
|
104505622a
|
Merge branch 'gx/xma_local' into master_xma_local
|
2020-12-26 18:28:21 +08:00 |
zhangqiang
|
a90dc5ff6b
|
【抽卡修改】提交
|
2020-12-26 17:20:38 +08:00 |
jiaoyangna
|
d5d30fd6a8
|
刷新礼包修改
|
2020-12-26 11:47:16 +08:00 |
gaoxin
|
aaf7a4f470
|
【引导】修复会部分功能重复开启会重复引导的问题
|
2020-12-25 15:34:38 +08:00 |
ZhangBiao
|
6945cbcacf
|
【森罗幻境】红点修改
|
2020-12-25 12:05:23 +08:00 |
ZhangBiao
|
6befa383c8
|
【降妖夺宝】界面调整
|
2020-12-24 18:36:38 +08:00 |
ZhangBiao
|
49dc0f172c
|
【无尽副本】重置事件点无法触碰修复
(cherry picked from commit e5b00c5cd9 )
|
2020-12-24 18:01:11 +08:00 |
ZhangBiao
|
3516c10cc6
|
[森罗环境] 扎小怪计入击杀奖励
|
2020-12-24 17:16:33 +08:00 |
ZhangBiao
|
601eefb120
|
【降妖夺宝】点击抽卡时可以切换其他界面修复
|
2020-12-24 16:57:39 +08:00 |
zhangqiang
|
95c753a70e
|
【大闹天宫】上阵纯治疗神将,战斗失败后选择保留状态,报错
|
2020-12-24 16:52:46 +08:00 |
jiaoyangna
|
a6a596746d
|
Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容
|
2020-12-24 16:46:48 +08:00 |
jiaoyangna
|
6e96218bc3
|
逍遥 红点
|
2020-12-24 16:45:36 +08:00 |
jiaoyangna
|
4fea51e35f
|
逍遥红点
|
2020-12-24 16:45:13 +08:00 |
ZhangBiao
|
c5022043fd
|
【道具使用跳转】跳转后返回关闭弹窗界面
(cherry picked from commit 150ec3eb2f )
|
2020-12-24 16:43:37 +08:00 |
ZhangBiao
|
4faa39ab2a
|
【道具使用跳转】使用跳转修改,活动道具要大于10000
(cherry picked from commit b2f8d14470 )
|
2020-12-24 16:42:24 +08:00 |
jiaoyangna
|
1f05f5f8f6
|
逍遥游 红点提交
|
2020-12-24 16:19:46 +08:00 |
jiaoyangna
|
29c5c08ea4
|
【优化】放生灵兽添加开启等级。
|
2020-12-24 16:19:22 +08:00 |
zhangqiang
|
26d714e1c5
|
【优化】等级成长礼
|
2020-12-24 16:06:10 +08:00 |
ZhangBiao
|
c57944e742
|
Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容
|
2020-12-24 15:13:15 +08:00 |
ZhangBiao
|
78ead0e8ad
|
【大闹天宫】一键上阵招募英雄
|
2020-12-24 15:13:03 +08:00 |
guowei
|
f25f253479
|
【合成优化修改】
|
2020-12-24 15:03:14 +08:00 |
ZhangBiao
|
8376d74230
|
【无尽副本】战斗失败自动复位时,自动进行一次一键上阵
|
2020-12-24 14:13:58 +08:00 |
ZhangBiao
|
8f9a58468f
|
【新将来袭】左上货币刷新不及时修复
|
2020-12-24 14:06:51 +08:00 |
guowei
|
df79f56b72
|
【优化五星成长礼包、心魔试炼礼包】
|
2020-12-24 13:52:28 +08:00 |
jiaoyangna
|
0054f5e646
|
【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名)
|
2020-12-24 10:37:38 +08:00 |
jiaoyangna
|
d0982716b3
|
[所向披靡] 提交
|
2020-12-24 10:24:11 +08:00 |
jiaoyangna
|
5a0bece22e
|
所向披靡修改
|
2020-12-24 10:23:02 +08:00 |
jiaoyangna
|
58de2dc2b5
|
【逍遥游优化】逍遥游玩法优化内容 红点修改
|
2020-12-24 09:55:57 +08:00 |
jiaoyangna
|
3a6e07bf1c
|
【逍遥游优化】逍遥游玩法优化内容
|
2020-12-23 20:18:43 +08:00 |
ZhangBiao
|
bb8321b4e3
|
【新将活动】连续抽卡妖精次数不足修复
|
2020-12-23 17:45:16 +08:00 |
ZhangBiao
|
8801a84c2b
|
【新将活动】商店跳转修复
|
2020-12-23 17:28:20 +08:00 |