Commit Graph

4481 Commits (2b1356db5c70d507df2020ab17642286355fbf24)

Author SHA1 Message Date
jiaoyangna 2b1356db5c 百寶商會 2021-05-29 18:36:27 +08:00
jiaoyangna 98b3a0caa2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 18:30:22 +08:00
jiaoyangna 14241e39df 無盡秘寶 提交 2021-05-29 18:29:50 +08:00
wangzhenxing a7de414589 [限时抽卡活动] 抽卡优化,奖励展示修改 2021-05-29 18:27:03 +08:00
ZhangBiao 07582f1918 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 18:17:49 +08:00
ZhangBiao 2fbbc6a52a 【修行】层级问题解决 2021-05-29 18:17:41 +08:00
gaoxin 1ecbe01f06 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 18:14:50 +08:00
gaoxin c15cf283ff 【跑马灯】修改跑马灯界面打开的位置 2021-05-29 18:14:11 +08:00
ZhangBiao ef4b272880 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 18:06:24 +08:00
jiaoyangna bff3c9b278 小游戲修改提交 2021-06-05 00:14:49 +07:00
ZhangBiao 5aeb2f0ed3 【修行】名字左侧印记提交 2021-05-29 18:06:15 +08:00
jiaoyangna 4724c13023 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 16:34:20 +08:00
jiaoyangna 6a4d713949 無盡添加戰力 2021-05-29 16:34:00 +08:00
ZhangBiao eb156ad3cd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 16:29:09 +08:00
ZhangBiao 43e24114c6 【幸运探宝】跑马灯bug修改 2021-05-29 16:28:59 +08:00
wangzhenxing 62f5514f80 [限时抽卡] 【公会福利红包】bug修改 2021-05-29 16:26:05 +08:00
zhangqiang 01edf58ee5 【隐藏踏碎凌霄排行按钮】 2021-05-29 16:12:47 +08:00
ZhangBiao 15051ea6f9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 15:40:02 +08:00
ZhangBiao 2a552d0730 【踏碎凌霄】引导增加活动是否开启检测 2021-05-29 15:39:21 +08:00
wangzhenxing b49fcce742 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 15:37:09 +08:00
wangzhenxing 574d95b607 [限时祈愿活动]======修改bug提交 2021-05-29 15:35:52 +08:00
gaoxin 1ea3890111 【战斗】报错优化 2021-05-29 15:21:41 +08:00
jiaoyangna 7149c17aef 小游戲加載圖片修改 2021-05-29 15:19:35 +08:00
zhangqiang 4b289f571b 【关卡属性提升界面修改】 2021-05-29 15:06:16 +08:00
wangzhenxing ee90abf1b4 【公会】========加入宗门报错修改提交 2021-05-28 19:41:43 +08:00
jiaoyangna a694f95bac 森罗幻境】小游戏卡死 2021-05-28 19:25:43 +08:00
jiaoyangna 876322a315 【限时兑换】人物名称标识调整 2021-05-28 19:16:43 +08:00
jiaoyangna f6d701fc6a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 18:53:57 +08:00
jiaoyangna fb8db45fda 百宝商会修改提交 2021-05-28 18:53:54 +08:00
zhangqiang cb7a727901 【踏碎凌霄】排行榜 2021-05-28 18:26:01 +08:00
wangzhenxing 53cbc08d48 [限时祈愿]=============抽卡修改 2021-05-28 16:54:40 +08:00
jiaoyangna e63200f4a2 预设修改提交 2021-05-28 16:26:12 +08:00
jiaoyangna 9e6c8248df Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 16:22:15 +08:00
jiaoyangna 9be6ae227a 小游戏 修改提交 2021-05-28 16:22:04 +08:00
ZhangBiao aaf98b4cf0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 16:20:26 +08:00
ZhangBiao ea4662a447 【福星高照】bug修复 2021-05-28 16:20:14 +08:00
jiaoyangna 60903eb982 活动修改提交 2021-05-28 16:19:20 +08:00
jiaoyangna cc081e68d9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 16:10:54 +08:00
jiaoyangna 68d39a1d5e 森罗修改提交 2021-05-28 16:10:44 +08:00
gaoxin 74d2dcfcbf Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 16:03:12 +08:00
gaoxin 9c0de19fd0 【注释】接口描述优化 2021-05-28 16:02:47 +08:00
jiaoyangna d165c87724 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-05-28 16:01:35 +08:00
jiaoyangna 7a104f9ff7 【主题活动累充】累充图标白篇且奖励间距不对 2021-05-28 16:01:03 +08:00
zhangqiang 78ece97bfd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:54:30 +08:00
zhangqiang 1dc1ad1db1 【幸运探宝】加标签 2021-05-28 15:54:20 +08:00
ZhangBiao a7f4b320d7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:35:11 +08:00
ZhangBiao 3c67b0b8f3 【主城】icon问题调整 2021-05-28 15:35:02 +08:00
gaoxin 9e06f1994d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:20:35 +08:00
gaoxin 51d04d5526 【每日豪礼】修复红点不消失的问题 2021-05-28 15:20:22 +08:00
ZhangBiao 5bd86d81fe Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:12:07 +08:00