Commit Graph

105 Commits (994d2602845afe8d9202a1f7a758f0a3ed454527)

Author SHA1 Message Date
ZhangBiao a549f0c45b 【礼包】特效层级问题修改 2021-06-04 18:52:23 +08:00
jiaoyangna 66954a3f65 礼包特效 2021-06-03 14:31:10 +08:00
ZhangBiao a1e7cb334a 【成长礼包】玉帝立绘下调 2021-05-29 22:49:24 +08:00
jiaoyangna 50de08e3f3 名称修改 2021-05-28 19:19:56 +08:00
jiaoyangna 2246cd5260 物名称标识调整 2021-05-28 19:18:43 +08:00
jiaoyangna 876322a315 【限时兑换】人物名称标识调整 2021-05-28 19:16:43 +08:00
gaoxin 95b207e1eb 【每日礼包】一键购买点击无效 2021-05-27 22:24:28 +08:00
ZhangBiao dd29682429 【成长礼包】新换的会动的玉皇大帝,后面没背景 2021-05-27 18:28:49 +08:00
gaoxin 19adbf944e 【每日礼包】资源修改 2021-05-27 14:02:53 +08:00
gaoxin bd27d190ac 【屏幕适配】部分界面优化 2021-05-20 16:12:15 +08:00
jiaoyangna 83697a9de4 Merge branch 'china/dev' into china/dev-c 2021-05-18 20:53:23 +08:00
gaoxin b9d362b333 【屏幕适配】活动适配优化 2021-05-17 14:32:42 +08:00
jiaoyangna 9662b5f236 Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/ArtFont_vi/x_xianshishangshi_banner_png_vi.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity3/shenjiang33_change.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_shangdian_xingchen_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png.meta
#	Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner_solgan_zh.png.meta
#	Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua
2021-05-15 16:37:00 +08:00
jiaoyangna 2ed525a64d 限时兑换预设修改 2021-05-13 20:06:07 +08:00
jiaoyangna ed41c4cf3c 成长礼包 2021-05-13 11:52:04 +08:00
jiaoyangna c66b323044 【活动优化】成长礼包banner替换及跳转增加流光特效 2021-05-12 21:05:36 +08:00
jiaoyangna 3c04e8dbe1 [主题活动修改提交]
(cherry picked from commit f88ccd8f68)
2021-05-12 17:37:59 +08:00
jiaoyangna 90b59093f0 修改礼包预设 2021-05-12 14:41:00 +08:00
jiaoyangna 16a67e5190 【活动优化】每日豪礼界面优化调整 2021-05-12 10:47:48 +08:00
jiaoyangna dc66043a06 【活动优化】百宝商会增加一键购买,礼包金额及奖励变更 2021-05-11 16:59:48 +08:00
jiaoyangna f88ccd8f68 [主题活动修改提交] 2021-05-10 10:06:53 +08:00
ZhangBiao e15921969a 【限时兑换】修改 2021-04-28 00:08:41 +08:00
ZhangBiao ba024be162 【踏碎凌霄】已未达成提交 2021-04-27 23:37:11 +08:00
ZhangBiao 8e72485e7b 【累计充值】资源替换 2021-04-27 21:17:42 +08:00
ZhangBiao 39f2f06563 【限时活动】调整 2021-04-27 17:05:53 +08:00
ZhangBiao 3512d1da7e 【开服累计充值】没有倒计时 2021-04-27 15:16:21 +08:00
ZhangBiao 90fbe78773 【积天豪礼】提交 2021-04-26 18:46:19 +08:00
zhangqiang cccc067c41 【特权商城光效】跳转至特权商城后,对应特权上的光效消失 2021-04-26 15:19:56 +08:00
gaoxin 9874f5b42a 【新人商城】法宝直升25级提示添加 2021-04-25 19:26:58 +08:00
ZhangBiao 5421e451c7 【云游商人】特效 2021-04-23 14:26:47 +08:00
wangzhenxing 1b92e5fed4 删除重复得问号 加号图片 2021-04-23 11:20:17 +08:00
ZhangBiao 99602b3008 【云游商人】问号,红点修改 2021-04-22 18:00:53 +08:00
ZhangBiao 8117c5ebba 【云游商人】怎加红点 2021-04-22 10:59:32 +08:00
ZhangBiao 8e76fc3e5d 【云游商人】提交 2021-04-21 20:24:06 +08:00
ZhangBiao aa834ad136 【限时活动】重构完成 2021-04-21 15:00:20 +08:00
ZhangBiao 5043002676 【限时活动】限时兑换 2021-04-20 21:15:38 +08:00
ZhangBiao a7bd34cdad 【限时活动】结构调整 2021-04-20 20:32:36 +08:00
ZhangBiao 2051a59d74 【达人活动】结构调整 2021-04-20 16:43:16 +08:00
ZhangBiao 11ea817c16 【云游商人】 2021-04-17 16:45:33 +08:00
ZhangBiao 07cda7e58e 【云游商人】提交 2021-04-16 17:25:11 +08:00
ZhangBiao 78e320eb26 【云游商人】 2021-04-16 16:21:34 +08:00
ZhangBiao 762aef88e0 【云游商人】提交 2021-04-16 14:58:40 +08:00
ZhangBiao 6064633a28 【云游商人】资源提交 2021-04-16 11:12:17 +08:00
ZhangBiao 314301c3b0 【活动优化】每日礼包(一键购买)按钮 资源替换 2021-04-13 14:22:00 +08:00
gaoxin 500d54469d 【扫光】挂机,充值界面扫光光效添加 2021-04-08 18:16:28 +08:00
gaoxin d6319948f2 【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。 2021-04-06 22:30:21 +08:00
jiaoyangna 292515e12e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 18:41:47 +08:00
jiaoyangna f8245898b0 特权礼包修改提交 2021-03-31 18:38:57 +08:00
ZhangBiao 9b533a698b 【适配】 2021-03-31 17:55:47 +08:00
ZhangBiao c280b85426 【适配】 2021-03-31 17:49:06 +08:00
jiaoyangna 2fa125f70e 特权礼包特效修改 2021-03-31 14:43:08 +08:00
jiaoyangna 43da7e2d51 十绝阵提交 2021-03-31 14:25:43 +08:00
jiaoyangna c2fac79eca 活动 提交 2021-03-30 18:26:10 +08:00
jiaoyangna ae51b547d5 活动提交 2021-03-30 10:48:34 +08:00
jiaoyangna c16e912777 成长礼包,每日礼包修改提交 2021-03-29 15:16:32 +08:00