zhangqiang
|
a9d77de2b2
|
【十绝阵】未产生宝箱时显示的领取截止时间错误
|
2021-04-06 11:38:25 +08:00 |
wangzhenxing
|
ef374b841a
|
[战斗]======破盾,清除提示文字修改
|
2021-04-02 15:02:14 +08:00 |
gaoxin
|
cbb28ebeae
|
【本地化】文本导出
|
2021-04-01 18:36:34 +08:00 |
jiaoyangna
|
0494e55215
|
Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
|
2021-03-30 20:41:32 +08:00 |
ZhangBiao
|
d61c55d24d
|
Merge branch 'china/dev' into 0活动开发聚集地/福星高照
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-03-30 18:55:35 +08:00 |
ZhangBiao
|
685ace078a
|
【福星高照】增加协议
|
2021-03-30 18:50:15 +08:00 |
wangzhenxing
|
2e886d4524
|
【战斗】====清除盾效果添加破盾提示文字,清除免疫,持续伤害,控制效果添加清除提示;被动278修改;被动添加排序;控制效果结束修改
|
2021-03-30 16:34:17 +08:00 |
jiaoyangna
|
a0552233ae
|
Merge branch 'china/dev' into 0活动开发聚集地/活动拆分归类
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-03-30 16:15:49 +08:00 |
jiaoyangna
|
87e724d19d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Common/functions.lua
|
2021-03-30 13:48:08 +08:00 |
jiaoyangna
|
ed1d9a2b1f
|
Merge branch '0功能/天书秘卷' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-03-30 13:46:49 +08:00 |
jiaoyangna
|
4e83f9a540
|
Merge branch 'china/dev' into 0活动开发聚集地/活动拆分归类
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-03-30 10:50:57 +08:00 |
zhangqiang
|
25e351dba3
|
【称号坐骑时装】修改
|
2021-03-30 10:28:03 +08:00 |
ZhangBiao
|
8796bf4957
|
【福星高照】提交
|
2021-03-30 10:27:18 +08:00 |
zhangqiang
|
76c9760993
|
Merge branch 'china/dev' into 0功能/称号坐骑皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab
|
2021-03-29 17:56:19 +08:00 |
jiaoyangna
|
c16e912777
|
成长礼包,每日礼包修改提交
|
2021-03-29 15:16:32 +08:00 |
gaoxin
|
a599ef10f9
|
【红点添加】限时兑换添加红点提示
|
2021-03-29 14:37:15 +08:00 |
ZhangBiao
|
e0d05e175e
|
【福星高照】提交
|
2021-03-29 09:52:53 +08:00 |
zhangqiang
|
9637337c39
|
【称号坐骑时装】 修改提交
|
2021-03-27 20:01:39 +08:00 |
zhangqiang
|
095701c33f
|
【称号时装坐骑】初提
|
2021-03-26 20:06:08 +08:00 |
ZhangBiao
|
24fa8c17e2
|
Merge branch '0活动开发聚集地/牛气冲天' into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-03-25 11:13:37 +08:00 |
jiaoyangna
|
a98e8e74f9
|
新字不消失修改
|
2021-03-25 10:39:49 +08:00 |
ZhangBiao
|
e8219c11b0
|
【牛气冲天】提交
|
2021-03-24 20:19:40 +08:00 |
ZhangBiao
|
b63845938a
|
【牛气冲天】提交
|
2021-03-24 13:43:56 +08:00 |
jiaoyangna
|
298946dd2d
|
Merge branch 'china/dev' into 0功能/天书秘卷
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-03-23 16:54:46 +08:00 |
jiaoyangna
|
001d6e16bc
|
主城入口提交
|
2021-03-23 16:02:22 +08:00 |
ZhangBiao
|
207d85e2a2
|
【牛气冲天】提交
|
2021-03-22 20:08:18 +08:00 |
jiaoyangna
|
a4facd8d13
|
天书秘卷
|
2021-03-22 15:16:29 +08:00 |
ZhangBiao
|
3d665074a2
|
【牛气冲天】提交
|
2021-03-22 11:09:49 +08:00 |
gaoxin
|
c6674710f9
|
【引导】2倍速引导增加
|
2021-03-19 18:14:52 +08:00 |
jiaoyangna
|
beb93b5ed9
|
天书秘卷
|
2021-03-19 14:37:24 +08:00 |
jiaoyangna
|
0cdd115646
|
Merge branch 'china/dev' into 0功能/天书秘卷
|
2021-03-16 18:32:52 +08:00 |
gaoxin
|
ef7130e056
|
修改首充界面错误
|
2021-03-16 18:29:25 +08:00 |
jiaoyangna
|
147d358e11
|
天书密卷
|
2021-03-16 17:37:32 +08:00 |
ZhangBiao
|
4528e23541
|
Merge branch 'china/dev' into 0活动开发聚集地/限时神装
|
2021-03-16 14:49:47 +08:00 |
jiaoyangna
|
c7860fec99
|
文字修改提交
|
2021-03-13 14:22:48 +08:00 |
jiaoyangna
|
7b5cc295e8
|
文字提交
|
2021-03-12 14:32:45 +08:00 |
jiaoyangna
|
838de7cd1c
|
文字提交
|
2021-03-12 14:31:52 +08:00 |
jiaoyangna
|
1cd3d4cdaa
|
文字提交
|
2021-03-12 14:20:14 +08:00 |
jiaoyangna
|
2a6a2e69da
|
图片提交,巅峰赛竞技守卫名字提交
|
2021-03-12 12:08:24 +08:00 |
ZhangBiao
|
24ea537bba
|
Merge branch 'master_xma_local' into 0活动开发聚集地/限时神装
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
|
2021-03-11 15:15:09 +08:00 |
gaoxin
|
12ecb9f437
|
【本地化】修复老包找不到Configmgr报错
|
2021-03-08 11:23:00 +08:00 |
ZhangBiao
|
33d6f64785
|
【本地化】鸿蒙阵结果中文修改
|
2021-03-08 10:57:57 +08:00 |
gaoxin
|
22dbfc310c
|
【本地化】我要变强推荐阵容显示修改,热更大小保留小数点后两位,十绝阵奖励显示修改
|
2021-03-07 20:48:05 +08:00 |
gaoxin
|
1e784087c9
|
【本地化】限时礼包限购提示文字本地化修改
|
2021-03-05 16:41:59 +08:00 |
ZhangBiao
|
eaac0b6cd1
|
Revert "【本地化】随机名字本地化"
This reverts commit 8dadc2d54b .
|
2021-03-05 14:36:19 +08:00 |
ZhangBiao
|
8dadc2d54b
|
【本地化】随机名字本地化
|
2021-03-05 14:32:29 +08:00 |
jiaoyangna
|
32618d66bf
|
神衣天降修改
|
2021-03-05 09:57:11 +08:00 |
gaoxin
|
d3a1cba41c
|
【管理】包配置管理加入
|
2021-03-04 19:29:15 +08:00 |
gaoxin
|
999e8e8cf4
|
Merge branch 'xma/dev' into xma/dev_temp
|
2021-03-04 16:51:55 +08:00 |
gaoxin
|
d31b9298df
|
【本地化】lua文本重新导出
|
2021-03-04 16:44:37 +08:00 |