Commit Graph

4392 Commits (5fde5a4473a3294065657dd4d36c74b8b1b64136)
 

Author SHA1 Message Date
wangzhenxing 5fde5a4473 [战斗]=============被动191修改,buff图标叠加添加免疫和连接符 2021-03-16 20:25:24 +08:00
wangzhenxing 15ce997282 [战斗]=============被动225修改 增加最大血量客户端特殊处理 2021-03-16 15:56:10 +08:00
ZhangBiao 749c219177 Merge branch 'xma/dev' into 0功能/本周版本优化内容 2021-03-15 10:39:41 +08:00
gaoxin 43c94a2c15 【充值】修改首充奖励规则 2021-03-15 10:38:24 +08:00
jiaoyangna 4e4dedec14 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-03-13 17:38:02 +08:00
jiaoyangna f48ee539f6 修改提交 2021-03-13 17:37:59 +08:00
ZhangBiao 17a9550df8 【首领来袭】 2021-03-13 15:52:50 +08:00
jiaoyangna b63d62c7f1 文字修改提交 2021-03-13 14:25:25 +08:00
jiaoyangna b260a2d0d8 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-03-13 14:22:54 +08:00
jiaoyangna c7860fec99 文字修改提交 2021-03-13 14:22:48 +08:00
ZhangBiao a9d26fb31e Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-03-13 14:01:04 +08:00
ZhangBiao e9cadb6cb9 重登确认框 2021-03-13 14:00:27 +08:00
jiaoyangna ea095efbfd Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-03-13 13:57:50 +08:00
jiaoyangna 8eec6650f2 图片提交 2021-03-13 13:57:42 +08:00
ZhangBiao 0779a816e0 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-03-13 12:57:41 +08:00
ZhangBiao 5334a7c7da 【首领来袭】 2021-03-13 12:57:31 +08:00
jiaoyangna 8656408ac9 宝箱状态修改 2021-03-12 18:18:25 +08:00
jiaoyangna 388f68d39d 鸿蒙提示修改 2021-03-12 17:28:10 +08:00
jiaoyangna 446d9c85ea 添加妖晶不足提示 2021-03-12 17:24:24 +08:00
jiaoyangna 5ed4d34201 合并修改提交 2021-03-12 17:08:51 +08:00
jiaoyangna aa94edf1d7 Merge branch 'xma/dev' into 0功能/本周版本优化内容 2021-03-12 16:41:18 +08:00
jiaoyangna 579f2806c3 竞技守卫名字修改提交
(cherry picked from commit d3efa809d8)
2021-03-12 16:35:55 +08:00
jiaoyangna fa64d90f08 社稷大点领取奖励后宝箱状态修改
(cherry picked from commit 7fe83b0cea)
2021-03-12 15:55:57 +08:00
jiaoyangna 5be52f6b33 限时活动提交
(cherry picked from commit e3460c8b83)
2021-03-12 15:48:29 +08:00
ZhangBiao 4f326e59e5 【本地化】战力排名弹窗,弹窗中无玩家排名,排名未刷新 2021-03-12 15:10:55 +08:00
ZhangBiao 51c0b51a87 【本地化】魂灵宝处需要修改 2021-03-12 15:07:17 +08:00
jiaoyangna 7b5cc295e8 文字提交 2021-03-12 14:32:45 +08:00
jiaoyangna 838de7cd1c 文字提交 2021-03-12 14:31:52 +08:00
jiaoyangna dd706075d2 Merge branch 'xma/dev' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
2021-03-12 14:30:10 +08:00
jiaoyangna 8430af12af 文字提交 2021-03-12 14:24:41 +08:00
jiaoyangna 1cd3d4cdaa 文字提交 2021-03-12 14:20:14 +08:00
jiaoyangna decb1e6ff0 图片提交 2021-03-12 14:13:42 +08:00
jiaoyangna 2a6a2e69da 图片提交,巅峰赛竞技守卫名字提交 2021-03-12 12:08:24 +08:00
jiaoyangna 5acc67ead5 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-03-12 11:11:25 +08:00
jiaoyangna a018c485c0 哪吒修改提交 2021-03-12 11:11:14 +08:00
wangzhenxing 491a6f311a [战斗]========= buff 叠层表现修改 2021-03-12 11:04:06 +08:00
jiaoyangna 04ab1e5451 社稷大典奖励领取提交 2021-03-12 10:32:32 +08:00
ZhangBiao b926310982 【大闹天宫】死亡神将可以一键上阵,并且进入战斗页直接显示(败) 2021-03-11 15:05:38 +08:00
ZhangBiao 9b30532bda 【图鉴】十星神将图鉴等级显示错误 2021-03-11 14:32:08 +08:00
ZhangBiao 1e2dc32804 【列表打开动画】森罗幻境选择神将界面,每选中一个头像都会播一遍动画 2021-03-11 14:28:44 +08:00
jiaoyangna 292069ba5d 活动提交 2021-03-11 10:59:49 +08:00
ZhangBiao 4631f663a8 【本地化】魂灵宝处需要修改 2021-03-11 10:41:34 +08:00
ZhangBiao fbe4e36c95 【鸿蒙阵】加速冷却,妖精不足时提示不足,领取妖精后依然提示不足,重登正常 2021-03-11 10:21:48 +08:00
ZhangBiao 867dcf5007 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-10 18:35:38 +08:00
ZhangBiao 884abb765d 【车迟斗法】修改 2021-03-10 18:35:14 +08:00
gaoxin 2e6cfc3232 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-10 18:11:32 +08:00
gaoxin 17a9108b01 【网络】修复断开连接接口参数错误 2021-03-10 18:11:27 +08:00
ZhangBiao 4a3b79fce7 【锻器阁】添加材料图标不对称 2021-03-10 17:57:19 +08:00
zhangqiang 88d1464fb3 【大闹天宫前端修改提交】 2021-03-10 17:42:17 +08:00
zhangqiang 0ba3ebb44d 【大闹天宫修改】前端圣物战力 商店节点加妖晶显示 2021-03-10 17:33:13 +08:00