Commit Graph

1860 Commits (5e8bab74af60ec3fce8f3bd2491a7edf885c9a1b)

Author SHA1 Message Date
jiaoyangna 77dea82a94 【ID1016745】
【升级豪礼】新到的图片资源,需要替换
2021-06-21 11:42:19 +08:00
jiaoyangna 0014224024 【ID1016741】
【界面UI】全面屏手机界面适配异常
2021-06-21 11:30:50 +08:00
jiaoyangna daba103fdb 【ID1016741】
【界面UI】全面屏手机界面适配异常
2021-06-21 11:06:23 +08:00
jiaoyangna 0f309447c2 【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
2021-06-21 10:53:24 +08:00
jiaoyangna e5ff298534 Revert "【ID1016740】"
This reverts commit 343b92aff9.
2021-06-21 10:38:09 +08:00
jiaoyangna 343b92aff9 【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
2021-06-21 10:36:33 +08:00
jiaoyangna c2f6c54063 【ID1016741】
【界面UI】全面屏手机界面适配异常
2021-06-21 10:22:21 +08:00
jiaoyangna f4fe155533 大圣修改 2021-06-19 17:47:35 +08:00
jiaoyangna 67e5cbf8c9 大圣 不能查看详情修改 2021-06-19 15:29:31 +08:00
jiaoyangna bf1e1f69e6 添加以领取标志 2021-06-18 19:13:51 +08:00
jiaoyangna e267c0096b 预设提交 2021-06-18 18:56:46 +08:00
jiaoyangna 45a1079d88 大圣提交 2021-06-18 18:55:04 +08:00
jiaoyangna 60b2cf1cf6 Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
2021-06-18 18:27:01 +08:00
jiaoyangna e562176180 超凡入圣提交 2021-06-18 18:24:04 +08:00
ZhangBiao ddfe59a1d0 【升星有礼】 2021-06-18 18:17:36 +08:00
ZhangBiao a05df3c77e 【升星有理】 2021-06-18 18:10:58 +08:00
ZhangBiao a60e8a4329 【惊喜礼盒】底部回弹位置低 2021-06-18 15:06:53 +08:00
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 6ca32cdde3 【惊喜礼盒】提交 2021-06-17 18:50:19 +08:00
ZhangBiao bd4796a4af 【惊喜礼盒】右侧文字格式修改 2021-06-17 18:04:10 +08:00
jiaoyangna 4c1cd67e6e Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner 2021-06-17 17:56:51 +08:00
ZhangBiao a6f4c307b5 【惊喜礼盒】 2021-06-17 17:55:14 +08:00
ZhangBiao 9b6e14eeb1 【惊喜礼盒】完成! 2021-06-17 17:43:56 +08:00
jiaoyangna 5c09522231 Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner 2021-06-17 17:19:27 +08:00
ZhangBiao 87f3fa8f64 【惊喜礼盒】提交 2021-06-17 17:09:36 +08:00
ZhangBiao 54bc0f2caa 【惊喜礼盒】提价 2021-06-17 15:26:10 +08:00
jiaoyangna b1e3d0a163 Merge branch '0功能/升星预览' into china/dev-c 2021-06-17 15:05:03 +08:00
gaoxin 12bd0b64a1 Merge branch 'china/zf_test' into china/dev-c
# Conflicts:
#	Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
2021-06-17 10:26:13 +08:00
ZhangBiao 0b4c5f3c8f 【惊喜礼盒】提交 2021-06-16 19:56:10 +08:00
jiaoyangna 27bfb84fb5 问号大小修改提交 2021-06-16 15:29:29 +08:00
jiaoyangna 0bfea18692 问号大小修改 2021-06-16 15:25:48 +08:00
jiaoyangna c5ecf50429 修改问号位置 2021-06-16 15:12:05 +08:00
ZhangBiao 656c8b3359 【惊喜礼盒】提交 2021-06-16 11:59:52 +08:00
jiaoyangna b83e8902d7 【ID1009368】
添加升星预览功能
2021-06-16 11:16:41 +08:00
JieLing b7e78d9d5f Revert Revert "【包配置】将登录图配置放到streaming文件夹" 2021-06-16 10:44:12 +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
gaoxin 0e2ec48bdc Revert "【山河试炼】代码提交"
This reverts commit 8cd3afb034.
2021-06-16 10:08:52 +08:00
gaoxin a4fa7cacff Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f.
2021-06-16 10:08:41 +08:00
ZhangBiao 160a3e1a6f 【山河试炼】差红点的检测 2021-06-15 20:33:22 +08:00
ZhangBiao 8cd3afb034 【山河试炼】代码提交 2021-06-15 15:46:01 +08:00
ZhangBiao fbc5316b01 【山河试炼】界面提交 2021-06-15 14:25:22 +08:00
ZhangBiao 4df5b08d1f 【山河试炼】开坑 2021-06-15 11:40:47 +08:00
gaoxin 28c7d285a0 Revert "【包配置】将登录图配置放到streaming文件夹"
This reverts commit 03d56901d7.
2021-06-11 02:36:08 +08:00
gaoxin 03d56901d7 【包配置】将登录图配置放到streaming文件夹 2021-06-11 01:48:39 +08:00
gaoxin 77acfd6bcd 【登录】版号信息走表配置 2021-06-11 01:45:09 +08:00
zhangqiang 18950a2326 【山河社稷图】章节图标修改 2021-06-10 14:43:45 +08:00
zhangqiang 0598fe8bdf 【修行特效】 2021-06-10 13:45:23 +08:00
gaoxin 1a12b261d5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 20:20:38 +08:00