Commit Graph

486 Commits (e5621761800d17b8236532c4b80fc54b2cc5b003)

Author SHA1 Message Date
jiaoyangna 09095e5b16 Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
2021-06-18 11:08:40 +08:00
jiaoyangna 10c86e509a 超凡入圣修改提交 2021-06-18 10:50:04 +08:00
ZhangBiao 54bc0f2caa 【惊喜礼盒】提价 2021-06-17 15:26:10 +08:00
ZhangBiao 0b4c5f3c8f 【惊喜礼盒】提交 2021-06-16 19:56:10 +08:00
ZhangBiao 656c8b3359 【惊喜礼盒】提交 2021-06-16 11:59:52 +08:00
gaoxin b3fca866e8 Revert "【山河试炼】开坑"
This reverts commit 4df5b08d1f.
2021-06-16 10:09:15 +08:00
gaoxin 3dc9dd5d64 Revert "【山河试炼】界面提交"
This reverts commit fbc5316b01.
2021-06-16 10:09:04 +08:00
ZhangBiao fbc5316b01 【山河试炼】界面提交 2021-06-15 14:25:22 +08:00
ZhangBiao 4df5b08d1f 【山河试炼】开坑 2021-06-15 11:40:47 +08:00
ZhangBiao 6152c52f2c 【牛气冲天】阶段性奖励中的自选箱,点击后可见自选箱的神将内容 2021-06-15 10:22:32 +08:00
JieLing 530374e00b 【资源】循环引用资源优化 2021-06-10 22:53:11 +08:00
zhangqiang 3506d2bb2c 【页签图标替换】局部 + 修行提示文字修改 2021-06-10 16:33:43 +08:00
zhangqiang d91c57f6ea 【心魔试炼】 2021-06-09 19:48:28 +08:00
gaoxin a10d34b076 【逐胜之巅】入口资源添加文字 2021-06-09 18:18:35 +08:00
gaoxin 5a54f51107 【主界面】逐胜之巅资源替换 2021-06-09 15:00:49 +08:00
zhangqiang 04fba6a182 【页签优化】游戏内分页签高度距离统一化 2021-06-09 12:32:30 +08:00
jiaoyangna debd1f0a63 心愿抽卡 资源提交 2021-06-08 14:55:06 +08:00
jiaoyangna 54cc26cb51 图片替换修改提交 2021-06-07 16:44:42 +08:00
gaoxin 51eb62af65 【资源】新增一批功能提示按钮 2021-06-03 13:57:40 +08:00
gaoxin d65ec0fe2a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:26:02 +08:00
gaoxin 4d757a84d8 【资源】添加逍遥游预告icon 2021-06-02 20:25:50 +08:00
jiaoyangna 26cd24eba1 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:21:33 +08:00
jiaoyangna 06cac292f2 每日豪礼 修改提交 2021-06-02 20:20:39 +08:00
ZhangBiao 4cc35be589 【牛气冲天】界面按钮调整 2021-06-02 20:11:37 +08:00
gaoxin cf189bbbb6 【每日充值】文字替换 2021-06-02 19:45:24 +08:00
gaoxin 3f605a818b 【资源】修改白金框资源 2021-06-02 17:30:39 +08:00
wangzhenxing aa3171aef7 [抽卡祈愿]======活动报错修改 2021-06-01 14:41:28 +08:00
gaoxin 081ff4c0d8 【资源】修行和困难副本预告图标上传 2021-05-31 19:20:37 +08:00
gaoxin 8b35b8ccf7 【踏碎凌霄】称号icon上传 2021-05-31 17:32:18 +08:00
jiaoyangna 37b818abb5 图片提交 2021-05-29 21:06:11 +08:00
ZhangBiao 5aeb2f0ed3 【修行】名字左侧印记提交 2021-05-29 18:06:15 +08:00
gaoxin b20c824b8a 【资源】新增碎片框资源 2021-05-29 16:26:12 +08:00
jiaoyangna d3098d3b3b 百寶 2021-05-29 15:06:31 +08:00
jiaoyangna fb8db45fda 百宝商会修改提交 2021-05-28 18:53:54 +08:00
gaoxin 05c3f30a7f 【资源】主界面活动按钮优化 2021-05-28 15:53:40 +08:00
ZhangBiao 4af21bc33d 【幸运探宝】进度条奖励包装显示修改 2021-05-28 15:11:57 +08:00
wangzhenxing 347341ca02 [福利]红包修改提交 2021-05-28 12:36:39 +08:00
wangzhenxing 560089c1f5 [限时祈愿活动] 预设 协议提交 2021-05-28 10:58:20 +08:00
wangzhenxing 675ef2efd7 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
	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2021-05-28 10:47:07 +08:00
wangzhenxing 21574bebf1 【限时祈愿】==祈愿活动提交 2021-05-28 10:36:55 +08:00
jiaoyangna 1e247043ac Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-27 19:42:22 +08:00
ZhangBiao 0c78275a6e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 14:09:51 +08:00
ZhangBiao e615af9011 【福星高照】bug修改 2021-05-27 14:09:39 +08:00
zhangqiang 0bcd6ade1f 【山河社稷图】bug + 资源 前端得刷资源 2021-05-27 14:06:20 +08:00
ZhangBiao 7ddf0dd07f 【福星高照】按钮提交 2021-05-27 10:03:57 +08:00
gaoxin 653d9bbd06 【meta】 2021-05-26 13:43:11 +08:00
jiaoyangna 5fb2aa23ce 无尽副本修改提交 2021-05-25 16:20:56 +08:00
ZhangBiao daf5a675f8 【修行】预览界面资源添加 2021-05-22 18:52:49 +08:00
jiaoyangna f3e48f1d38 牛气冲天按钮提交 2021-05-22 17:10:16 +08:00
wangzhenxing 1478142476 称号资源替换提交 2021-05-22 15:02:09 +08:00