Commit Graph

132 Commits (d0d20db65b4af15fe9b2010cb7b7a95f0e89f4a0)

Author SHA1 Message Date
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 1732d1e2db 红点变灰修改 剩余时间文字描述修改 2021-05-13 20:31:47 +08:00
jiaoyangna ed41c4cf3c 成长礼包 2021-05-13 11:52:04 +08:00
jiaoyangna 6556a240e4 【活动优化】成长礼包banner替换及跳转增加流光特效 2021-05-13 10:53:12 +08:00
jiaoyangna f2dd955ea8 【活动优化】成长礼包banner替换及跳转增加流光特效 2021-05-13 10:46:41 +08:00
jiaoyangna c66b323044 【活动优化】成长礼包banner替换及跳转增加流光特效 2021-05-12 21:05:36 +08:00
jiaoyangna 20b5ded8e9 修改add 为addOnce
(cherry picked from commit 14b1420d14)
2021-05-12 17:42:51 +08:00
jiaoyangna 3c04e8dbe1 [主题活动修改提交]
(cherry picked from commit f88ccd8f68)
2021-05-12 17:37:59 +08:00
jiaoyangna 14b1420d14 修改add 为addOnce 2021-05-12 14:38:45 +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
jiaoyangna 660299a6d2 六星玉帝入口跳转特定礼包修改提交 2021-04-29 10:08:28 +08:00
ZhangBiao 23d3fa42fd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-28 05:10:31 +08:00
ZhangBiao 95b4b8197a 【特权商城】特效消失修改 2021-04-28 05:10:00 +08:00
wangzhenxing 46857168c1 6星玉帝入口消失逻辑添加容错 2021-04-28 03:34:53 +08:00
wangzhenxing e918945386 主城六星玉帝入口进入成长礼包滑动到指定条目 2021-04-28 00:32:55 +08:00
zhangqiang f20c58dc96 【公会援助】 每次点击援助,列表都会重新置顶显示----3 2021-04-27 17:56:55 +08:00
gaoxin 357a27c100 Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-04-26 19:03:05 +08:00
wangzhenxing ebde6e43b0 [功能]========【ID1008784】 【活动优化】增加成长礼包入口跳转功能 2021-04-26 15:45:30 +08:00
jiaoyangna f38e838967 特权商城跳转到对应礼包位置 2021-04-26 10:38:57 +08:00
gaoxin 379de4fed0 【活动】每日礼包不再在界面中刷新数据,会导致死循环 2021-04-25 11:14:14 +08:00
ZhangBiao 2df3ac159c 【限时活动】完成?删除loggreen 2021-04-21 16:36:12 +08:00
jiaoyangna 61833b8b00 Merge branch '0功能/挂机界面' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2021-04-20 17:51:14 +08:00
jiaoyangna a277c5e6fa Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-17 17:20:58 +08:00
jiaoyangna fe837c22f4 Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
2021-04-17 17:20:52 +08:00
JieLing eb5cfeb7f8 【每日礼包】一键购买修改 2021-04-17 16:16:10 +08:00
ZhangBiao 48720f5dff 【新人商城】资源提交
(cherry picked from commit 8922b7eaba)
2021-04-17 14:03:35 +08:00
jiaoyangna 909078e7ae 【每日礼包】 修改提交 2021-04-16 18:06:33 +08:00
jiaoyangna dafce7d9eb 礼包刷新界面死循环修改 2021-04-16 11:22:18 +08:00
zhangqiang 3a4d593fdb 【礼包 公会援助】列表刷新置顶问题 2021-04-15 16:25:00 +08:00
jiaoyangna 071a91773a 导出 文本提交 2021-04-09 12:26:35 +08:00
jiaoyangna 0ab7c3177a 还原文字提交 2021-04-09 12:06:17 +08:00
ZhangBiao 8893dd7d7b 【活动优化】日周月礼包增加角标及妖晶数量变更 2021-04-09 11:05:08 +08:00
gaoxin 500d54469d 【扫光】挂机,充值界面扫光光效添加 2021-04-08 18:16:28 +08:00
zhangqiang 894a8bcfd4 【问题提交】 2021-04-07 19:52:25 +08:00
zhangqiang 69d3f4a331 【bug 主要是翻译】 2021-04-07 16:38:26 +08:00
gaoxin 9033d47109 【本地化】文本导出 2021-04-06 22:33:57 +08:00
gaoxin d6319948f2 【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。 2021-04-06 22:30:21 +08:00
gaoxin cf5a2a46fa 【本地化】还原文本到代码种 2021-04-06 15:23:27 +08:00
gaoxin fc28c2c0a3 Merge branch 'china/dev' into gx/china/dev_tr 2021-04-06 15:21:49 +08:00
gaoxin 08c5c7b423 【本地化】导出文本 2021-04-06 15:21:38 +08:00
jiaoyangna 57604c4c76 成长礼包提交 2021-04-02 11:41:50 +08:00
jiaoyangna 640c866388 成长礼包 红点修改 2021-04-02 11:24:59 +08:00
jiaoyangna 053f890498 成长礼包修改提交 2021-04-01 19:04:01 +08:00
gaoxin b53717c9ee 【本地化】还原文本 2021-04-01 18:41:50 +08:00
gaoxin cbb28ebeae 【本地化】文本导出 2021-04-01 18:36:34 +08:00
jiaoyangna 0e752b76a6 每日礼包 换天自动刷新修改 2021-04-01 16:12:20 +08:00
jiaoyangna b21ed5a44e 礼包修改提交 2021-04-01 15:42:59 +08:00
jiaoyangna 56605c0ab7 购买特权 刷新礼包 修改 2021-03-31 19:56:31 +08:00