Commit Graph

7351 Commits (795d19d63a9a78840a932420af56a34facd39c5e)

Author SHA1 Message Date
ZhangBiao 795d19d63a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 18:53:34 +08:00
ZhangBiao 0377b2b642 【特惠商城】提交 2021-12-17 18:53:24 +08:00
jiaoyangna e6796ee70f 超值返利修改提交 2021-12-17 18:46:05 +08:00
jiaoyangna 196cb329b3 提示文字修改提交 2021-12-17 17:48:26 +08:00
wangzhenxing ef680be056 [战斗]======护盾效果修改 2021-12-17 17:31:58 +08:00
ZhangBiao 88980286eb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:20:24 +08:00
ZhangBiao 08806bc18f 【寻仙招募】改为常驻后,奖励中的概率有效期去掉 2021-12-17 17:20:13 +08:00
jiaoyangna 5c042b2c60 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:19:58 +08:00
jiaoyangna 893cd69527 特效被切修改提交 2021-12-17 17:19:30 +08:00
ZhangBiao df483145bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 17:13:57 +08:00
ZhangBiao a9b7c21fad 【道具弹窗】跳转按钮错位 2021-12-17 17:13:45 +08:00
gaoxin ce0c1db2f3 【关卡】解锁提示资源提交 2021-12-27 16:55:17 +08:00
jiaoyangna 6b234c7f2f 文字重叠修改提交 2021-12-17 16:53:26 +08:00
jiaoyangna 3119f9b277 价格描述修改 2021-12-17 16:43:24 +08:00
jiaoyangna 16c00cbffc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 16:41:26 +08:00
jiaoyangna ffd7d0ecbe 超值返利修改提交 2021-12-17 16:41:08 +08:00
ZhangBiao 8ad3346af9 【特惠商城】 2021-12-17 16:05:51 +08:00
ZhangBiao 0e732fa8b6 【新人商城】结束后关闭 2021-12-17 14:44:44 +08:00
ZhangBiao 2eb83d4c63 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 14:13:53 +08:00
ZhangBiao d34d896f47 【成长礼包】提交 2021-12-17 14:13:41 +08:00
gaoxin db2d3c8433 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-27 14:01:06 +08:00
gaoxin 1c9d3caa75 【罗浮】原罗浮商店跳转到逐胜商店 2021-12-27 14:00:47 +08:00
jiaoyangna 1a8f01c2fd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 14:12:13 +08:00
jiaoyangna 83b1fad0b7 跳转修改提交 2021-12-17 14:11:03 +08:00
ZhangBiao d5ae25820d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-17 14:00:15 +08:00
ZhangBiao d939e6b32b 【新人商城】提交 2021-12-17 14:00:07 +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