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 |
jiaoyangna
|
104f52f61b
|
特权礼包滑动位置 修改
|
2021-03-31 19:30:45 +08:00 |
jiaoyangna
|
e73cf4533b
|
报错修改
|
2021-03-31 19:07:50 +08:00 |
jiaoyangna
|
f8245898b0
|
特权礼包修改提交
|
2021-03-31 18:38:57 +08:00 |
jiaoyangna
|
29d8059755
|
特效修改
|
2021-03-31 17:55:33 +08:00 |
jiaoyangna
|
14e2e0dd2a
|
挑战特权商店特效显示
|
2021-03-31 16:09:15 +08:00 |
jiaoyangna
|
2fa125f70e
|
特权礼包特效修改
|
2021-03-31 14:43:08 +08:00 |
jiaoyangna
|
9350e899f9
|
特权礼包倒计时修改提交
|
2021-03-31 11:55:16 +08:00 |
jiaoyangna
|
8c87d221fb
|
活动 动态加载改名
|
2021-03-31 11:26:55 +08:00 |
jiaoyangna
|
965f9c19e9
|
特权添加时间
|
2021-03-30 22:59:01 +08:00 |
jiaoyangna
|
dea7c12ded
|
层级报错 修改
|
2021-03-30 22:36:31 +08:00 |
jiaoyangna
|
e9803f2760
|
文字错乱修改
|
2021-03-30 22:28:56 +08:00 |
jiaoyangna
|
b7a0cca0fe
|
成长基金修改提交
|
2021-03-30 22:19:54 +08:00 |
jiaoyangna
|
c69cc0cc14
|
每日充值显示错误修改
|
2021-03-30 22:06:59 +08:00 |
jiaoyangna
|
23b46ba218
|
活动 修改提交
|
2021-03-30 20:17:26 +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 |
ZhangBiao
|
97ae8966d7
|
【充值界面】
|
2021-03-18 14:10:23 +08:00 |