Commit Graph

6500 Commits (15051ea6f995be890d3382725718c6eef277608e)
 

Author SHA1 Message Date
zhangqiang dfa198081a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 14:51:58 +08:00
zhangqiang a1c4a6aa5c 【心魔】 + 山河社稷图修改 2021-05-25 14:51:26 +08:00
ZhangBiao 42b6dd4d7a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 11:54:32 +08:00
ZhangBiao 41152acae9 【修行】排行榜界面,神将界面、神将替换提示调整 2021-05-25 11:54:19 +08:00
jiaoyangna 80691b1a9e 限购次数修改提交
(cherry picked from commit f7235b087b)
2021-05-25 11:33:52 +08:00
jiaoyangna f7235b087b 限购次数修改提交 2021-05-25 11:22:30 +08:00
wangzhenxing 32b28f03eb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 11:15:04 +08:00
wangzhenxing 1e82024f29 添加弹窗类型 2021-05-25 11:14:50 +08:00
ZhangBiao e3a45d34b5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 11:06:29 +08:00
ZhangBiao 1e2a932096 【修行预览、神将信息】 2021-05-25 11:06:20 +08:00
jiaoyangna 4a5dc61add Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:32:54 +08:00
jiaoyangna bec733c9d6 预设提交 2021-05-25 10:32:42 +08:00
gaoxin 289a75c741 【挂机】修复挂机帮助和vip任务重叠的问题 2021-05-25 10:31:44 +08:00
gaoxin 6a49d684e0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:30:47 +08:00
jiaoyangna 5ceb07ca7d 删除图片提交 2021-05-25 10:30:32 +08:00
gaoxin e7c8d5290d 【仙缘抽】修复报错 2021-05-25 10:30:18 +08:00
jiaoyangna 919294b575 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:28:32 +08:00
jiaoyangna e12700bfa2 图片提交 2021-05-25 10:28:16 +08:00
ZhangBiao a22a984c61 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:16:17 +08:00
ZhangBiao cecea9b415 【修行】主界面 修行提交 1 2021-05-25 10:16:07 +08:00
jiaoyangna 5f9b35a66c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:07:42 +08:00
jiaoyangna c9c5480484 福星高照 提交 2021-05-25 10:07:31 +08:00
gaoxin caa32bac70 【红包】消息删除空格 2021-05-25 10:00:42 +08:00
gaoxin bfbc185604 【抽卡】仙缘汇聚箱加入山河社稷图星数条件 2021-05-24 20:33:26 +08:00
jiaoyangna 40fcabaf55 牛气冲天 提交 2021-05-24 20:26:53 +08:00
jiaoyangna 4452bb1d9a 音效提交 2021-05-24 20:22:38 +08:00
jiaoyangna 1d11aeb1b0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 19:50:38 +08:00
jiaoyangna b36d04f7d7 牛气冲天 修改 2021-05-24 19:50:21 +08:00
gaoxin 23001be1b4 【战斗】跳过优化 2021-05-24 19:20:22 +08:00
wangzhenxing 31a58128c1 退出公会黑屏bug修改 2021-05-24 18:27:13 +08:00
zhangqiang b728d3a396 【t3资源漏提】 2021-05-24 17:01:04 +08:00
gaoxin 563587e640 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 16:58:31 +08:00
gaoxin 24498b21a9 【公会】成员信息界面报错修复 2021-05-24 16:58:26 +08:00
ZhangBiao 6294f34149 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 16:38:41 +08:00
ZhangBiao 43a817235f 【修行】英雄选择附身中 2021-05-24 16:38:30 +08:00
gaoxin e308fd0149 【主界面】修复update方法不能停止的问题 2021-05-24 16:24:16 +08:00
gaoxin 6d9f8f2f3d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 15:44:17 +08:00
gaoxin d37728e374 【配置】修复公告兑换码不显示的问题 2021-05-24 15:44:10 +08:00
zhangqiang 41bf14a6ad 【山河社稷图】GM 2021-05-24 15:19:25 +08:00
jiaoyangna 6e90a19270 协议提交 2021-05-24 15:02:57 +08:00
jiaoyangna 34fd873ac4 修改提交 2021-05-24 15:00:38 +08:00
ZhangBiao 0332366e9d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 14:58:09 +08:00
ZhangBiao 6f27423920 【修行】提交 2021-05-24 14:58:00 +08:00
jiaoyangna c68da98b84 Merge branch 'china/dev-c' into 0优化/无尽副本 2021-05-24 14:43:42 +08:00
jiaoyangna 1f914e4ae9 预设提交 2021-05-24 14:40:54 +08:00
gaoxin 4cc4bc87aa 【本地化】公告 2021-05-24 14:18:37 +08:00
gaoxin 4c02ba25cd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 14:16:52 +08:00
gaoxin 0f18eaf86c Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab
#	Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua
2021-05-24 14:15:30 +08:00
wangzhenxing 769042a739 master_test_gn协议提交 2021-05-24 14:14:11 +08:00
gaoxin acc2609df6 【本地化】公告 2021-05-24 14:09:11 +08:00