Commit Graph

7326 Commits (1c9d3caa75ea50223f32cf0fd6d574ec3a7e3e3b)

Author SHA1 Message Date
gaoxin 1c9d3caa75 【罗浮】原罗浮商店跳转到逐胜商店 2021-12-27 14:00:47 +08:00
jiaoyangna abb3c4ec5f 跳转修改提交 2021-12-17 13:30:45 +08:00
jiaoyangna 2f489fecad Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 13:29:24 +08:00
gaoxin 5bfb89d276 【关卡挂机】未解锁跳转功能添加 2021-12-27 13:11:33 +08:00
jiaoyangna 4fdd4e7b62 跳转修改提交 2021-12-17 13:29:08 +08:00
ZhangBiao f4b2a09f08 【商城界面】和信任商城 2021-12-17 12:08:15 +08:00
ZhangBiao 17b286b890 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 11:28:47 +08:00
ZhangBiao 45241e1d5d 【商城界面】提交 2021-12-17 11:28:37 +08:00
gaoxin 7d02fd5394 【解锁提示】添加解锁条件显示 2021-12-27 09:58:34 +08:00
jiaoyangna ab01f4ab25 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 11:23:11 +08:00
jiaoyangna ec53e8ad84 超值返利提交 2021-12-17 11:22:54 +08:00
ZhangBiao e580889f3f 【商城界面】无剩余次数修改 2021-12-17 09:56:48 +08:00
ZhangBiao 052d7418ca 【商城界面】提交 2021-12-17 09:31:45 +08:00
ZhangBiao 2cb1af4c8b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 19:22:57 +08:00
gaoxin ab3d7e939b 【解锁提示】添加功能解锁提示 2021-12-26 19:12:25 +08:00
ZhangBiao 5393485f65 【商城界面】提交 2021-12-16 19:22:46 +08:00
jiaoyangna 740aeac6bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 18:43:36 +08:00
gaoxin f0d9f4828f 【关卡新条件】条件显示在按钮上 2021-12-26 18:13:39 +08:00
gaoxin eaea265bc7 【物品】添加物品使用的限制等级 2021-12-26 17:35:50 +08:00
jiaoyangna 19a1e1b7ca 超值返利提交 2021-12-16 18:41:30 +08:00
jiaoyangna c1f0e0f78b 添加选中框 2021-12-16 18:38:32 +08:00
ZhangBiao b203711459 Merge branch 'china/dev' into 0优化/商城界面
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-12-16 17:17:16 +08:00
gaoxin cb8f8fe0aa 【挂机物品】添加时间标签 2021-12-26 17:13:30 +08:00
ZhangBiao 3a96f7cf4e 【商城界面】提交 2021-12-16 17:16:18 +08:00
ZhangBiao c915a3b9eb 【协议】提交 2021-12-16 17:00:47 +08:00
ZhangBiao 68d6e39882 【协议】提交 2021-12-16 16:58:20 +08:00
jiaoyangna 50927b9ac5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 16:55:46 +08:00
jiaoyangna 1ae167efb5 至尊降世修改提交 2021-12-16 16:55:30 +08:00
wangzhenxing 25bc46e049 [战斗]======被动197 技能126 147修改 2021-12-16 16:13:01 +08:00
gaoxin 969a22a768 【引导】修改引导天书密卷时主城场景的位置 2021-12-26 15:08:51 +08:00
ZhangBiao ae3f0c5df2 【连续礼包】新增连续礼包入口 2021-12-16 14:20:04 +08:00
gaoxin 7bf43f37f5 【挂机奖励】使用界面文字修改 2021-12-26 11:21:17 +08:00
ZhangBiao abb068e9cb 【商城界面】提交 2021-12-16 13:11:07 +08:00
ZhangBiao e9954f49f2 【商城界面】提交 2021-12-16 11:59:18 +08:00
jiaoyangna b811bd0d24 超值返利预设代码提交 2021-12-16 11:45:51 +08:00
jiaoyangna a40a8a67d4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 11:42:37 +08:00
jiaoyangna e2a1f147ae 活动修改提交 2021-12-16 11:42:20 +08:00
jiaoyangna 11c4f914b5 至尊降世提交 2021-12-16 11:42:00 +08:00
ZhangBiao 2858f2e400 【商城界面】提交 2021-12-16 10:46:11 +08:00
wangzhenxing d9f1670993 【战斗】====战斗gm报错修改 2021-12-16 10:24:36 +08:00
jiaoyangna 7c1a3caa5f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 10:10:05 +08:00
jiaoyangna 73283bd818 回退修改提交 2021-12-16 10:09:48 +08:00
wangzhenxing b46519d9c8 【战斗】=======反伤盾类型修改 2021-12-15 18:06:48 +08:00
wangzhenxing 020d8b1b05 [功能]=======战斗统计死亡单位置灰 2021-12-15 15:07:20 +08:00
jiaoyangna c6eb719fa6 添加回退消耗数量 2021-12-15 14:41:04 +08:00
ZhangBiao 0b190666d5 【商城界面】提交 2021-12-15 14:34:21 +08:00
jiaoyangna 568ad92a9b 回退修改 2021-12-15 14:28:36 +08:00
jiaoyangna c5448299c0 报错修改提交 2021-12-15 13:35:44 +08:00
jiaoyangna 4dc37c659c 回退修改提交 2021-12-15 10:58:49 +08:00
wangzhenxing 9f2a977b07 [功能]=========战斗统计界面添加死亡置灰 2021-12-15 09:44:35 +08:00