Commit Graph

11544 Commits (f0a4cec7675db1996908dcf527f2799cf835959c)
 

Author SHA1 Message Date
jiaoyangna f0a4cec767 【ID1010975】
【优化】超值返利每日首次登陆有红点提示
2021-12-29 17:10:48 +08:00
jiaoyangna 577752e71d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 16:31:41 +08:00
jiaoyangna 65dbdc5283 【ID1019454】
【魂印】替换魂印时不刷新界面,需要重新进入才能看到替换后的魂印
2021-12-24 16:31:25 +08:00
wangzhenxing d3253c5edb 【战斗】========技能释放逻辑修改,技能播放技能攻击动作 2021-12-24 16:11:53 +08:00
wangzhenxing b07d5548e6 [功能]========坐骑界面选中状态修改 2021-12-24 15:45:04 +08:00
wangzhenxing ca17383879 Merge branch 'china/dev' into china/dev_res 2021-12-24 14:55:22 +08:00
jiaoyangna 2a9b8c706e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 14:52:23 +08:00
jiaoyangna 09a810af3f 玉帝跳转提交 2021-12-24 14:52:05 +08:00
ZhangBiao a28021b4f6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 14:47:52 +08:00
ZhangBiao 80b6315905 【降妖夺宝】在活动页面,进入珍奇宝阁购买野球拳,足够10连抽时,10连按钮依然显示妖晶抽取 2021-12-24 14:47:39 +08:00
jiaoyangna b33bd02c7f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 14:25:22 +08:00
gaoxin 9965f8e079 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-30 23:29:11 +08:00
gaoxin 9c22dfc990 【提审】不再显示充值竖条,也不再触发相关引导 2021-12-30 23:28:55 +08:00
ZhangBiao fea92ffabc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 14:20:06 +08:00
jiaoyangna 36ec134505 玉帝获取途径跳转提交 2021-12-24 14:20:06 +08:00
ZhangBiao 99d00e88e2 【命格】合成界面第一次打开道具详情 2021-12-24 14:19:47 +08:00
luyao 0a9fcbde7c 【天蚀虎】头像 敬请期待图 2021-12-24 14:16:19 +08:00
wangzhenxing c7c6889e27 [资源]============虎年坐骑修改提交 2021-12-24 14:06:50 +08:00
wangzhenxing 6e2b1c1a17 [战斗]=======被动56 被动368修改 2021-12-24 14:00:51 +08:00
gaoxin e901bd9d3b 【轩辕宝镜】通关到最后一层,打开界面时列表位置没有固定在最新关 2021-12-30 22:37:35 +08:00
gaoxin d10d2f976a 【装备合成】添加输入改变合成数量的功能 2021-12-30 22:19:09 +08:00
gaoxin 613380a99f 【装备合成】添加长按自动增加数量功能 2021-12-30 20:32:11 +08:00
jiaoyangna 00dc90f4bb 商店报错添加容错 2021-12-24 11:05:39 +08:00
jiaoyangna 89b5eae8ec 商店添加容错 2021-12-24 10:58:55 +08:00
jiaoyangna e34092f93d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 10:54:16 +08:00
gaoxin 8f0567d801 【挂机】新人商城按钮资源修改 2021-12-30 03:05:32 +08:00
jiaoyangna b1c5113c39 商店报错添加容错 2021-12-24 10:53:26 +08:00
skuld 606bedd85c 【挂机】新人商城按钮效果修改 2021-12-23 17:43:36 +08:00
skuld 9d2f9b70cb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-23 17:31:25 +08:00
skuld bd746b40b0 bat Resource Commit:2021/12/23,17:27:24 2021-12-23 17:27:25 +08:00
ZhangBiao d06fdbbac6 【玲珑宝镜】玲珑商市跟随是否活动开启显示按钮 2021-12-23 17:19:27 +08:00
ZhangBiao 7f9726e006 【命格】提交 2021-12-23 16:39:37 +08:00
ZhangBiao 926e0a4fbd 【命石】一键合成修改 2021-12-23 16:17:35 +08:00
wangzhenxing c895652ef1 [战斗]======被动412 修改 2021-12-23 15:18:44 +08:00
gaoxin 7ea4c7bc51 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-30 00:01:21 +08:00
gaoxin da2b205955 【挂机】添加新人商城入口 2021-12-30 00:01:14 +08:00
wangzhenxing 3e640aef81 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-23 14:38:02 +08:00
gaoxin 5eec5952ef 【协议】更新到最新 2021-12-23 14:37:31 +08:00
wangzhenxing 76d9e596b4 [战斗]======被动412 提交 2021-12-23 14:37:19 +08:00
jiaoyangna 39254af42e 探索提交 2021-12-23 13:45:05 +08:00
luyao d62532c90c 【坐骑】资源名冲突修改 2021-12-23 11:46:13 +08:00
gaoxin cf87db6577 Merge branch 'china/dev' into china/dev_res 2021-12-23 11:05:25 +08:00
ZhangBiao e6d1ac6ef0 【修行】冲突修改 2021-12-23 09:53:00 +08:00
ZhangBiao e6aa1d31fe Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
2021-12-23 09:43:06 +08:00
gaoxin b74274b75a 【引导】添加战斗失败触发类型38, 添加引导进入假战斗类型20 2021-12-22 18:25:36 +08:00
wangzhenxing b7bfc1d867 【资源】======虎年坐骑提交 2021-12-22 16:15:51 +08:00
wangzhenxing a7dac651c6 [资源]=======罗刹spine修改 2021-12-22 16:14:42 +08:00
gaoxin be1ce2a189 【场景】添加开天新包配置 2021-12-22 15:15:02 +08:00
gaoxin 39495bee28 【至尊降世】修复老活动跳转报错 2021-12-21 21:03:42 +08:00
gaoxin 9a1350e8d3 【超值基金】语法错误 2021-12-21 18:27:15 +08:00