ZhangBiao
|
6e56b2862c
|
【牛转钱坤】增加红点
|
2021-01-28 15:03:16 +08:00 |
gaoxin
|
adf591cbec
|
【本地化】lua代码还原
|
2021-01-27 18:16:54 +08:00 |
zhangqiang
|
122ccb94e2
|
【优化】主城假人改为NPC或者排行榜角色 2
|
2021-01-27 17:36:33 +08:00 |
zhangqiang
|
a126c4ca2a
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-27 16:40:53 +08:00 |
zhangqiang
|
7b01f5fc07
|
【优化】主城假人改为NPC或者排行榜角色
|
2021-01-27 16:40:17 +08:00 |
gaoxin
|
c567dcd426
|
【本地化】代码本地化提交
|
2021-01-26 17:08:39 +08:00 |
ZhangBiao
|
78bc7e8ab3
|
Merge branch '0功能/本周版本优化内容' into 0活动开发聚集地/牛转乾坤
|
2021-01-26 13:49:08 +08:00 |
gaoxin
|
81b3ca1ddc
|
【本地化】 中文字还原,合并代码用
|
2021-01-26 11:13:09 +08:00 |
gaoxin
|
802881378c
|
Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
|
2021-01-26 11:08:54 +08:00 |
gaoxin
|
3b83a72215
|
【本地化】文字还原
|
2021-01-26 11:05:27 +08:00 |
jiaoyangna
|
14ba84052d
|
【ID1008002】
【活动需求】碧血丹心主题活动(限时兑换-掉落春节道具(鞭炮或者糖葫芦))新增扭转乾坤转盘活动。2月11日~2月17日【ID1008003】
【活动需求】势不可挡主题活动(易经宝库-挖矿活动)2月18日~2月24日【ID1008001】
【活动需求】叱咤风云主题活动(新将来袭-观音)2月4日~2月10日
|
2021-01-25 20:34:16 +08:00 |
ZhangBiao
|
9e14cada49
|
【牛转钱坤】完事了
|
2021-01-21 15:10:27 +08:00 |
ZhangBiao
|
20857d4e27
|
【牛转钱坤】差不多完事了
|
2021-01-20 18:27:23 +08:00 |
guowei
|
6617d818c0
|
【鸿蒙阵bug修改】
|
2021-01-20 13:52:53 +08:00 |
ZhangBiao
|
d7f4ad06ba
|
【限时神装】界面基本完成,差拍脸
|
2021-01-18 15:36:00 +08:00 |
DESKTOP-98AVA47\Administrator
|
040971534e
|
【巅峰赛限时头像修改】
|
2021-01-15 21:06:48 +08:00 |
ZhangBiao
|
136f640f60
|
【限时神装】
|
2021-01-15 17:50:43 +08:00 |
guowei
|
3f8312953e
|
Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
|
2021-01-14 10:20:12 +08:00 |
gaoxin
|
f501e92272
|
【本地化】代码还原,合并用
|
2021-01-12 11:00:44 +08:00 |
gaoxin
|
ae7da93056
|
【本地化】还原文字
|
2021-01-12 10:56:26 +08:00 |
jiaoyangna
|
4627e88c2f
|
主题活动提交
|
2021-01-12 10:39:41 +08:00 |
guowei
|
c252f1bae6
|
【鸿蒙阵修改】
|
2021-01-09 14:30:35 +08:00 |
gaoxin
|
27b3c1ea32
|
【本地化】还原文本到代码中合并用
|
2021-01-09 14:20:06 +08:00 |
jiaoyangna
|
d7dfdfcb2e
|
铜墙铁壁
|
2021-01-08 19:23:09 +08:00 |
zhangqiang
|
54ffbe55fc
|
【重置优化】将游戏中的各个玩法重置时间统一调整至0点
|
2021-01-08 19:15:08 +08:00 |
jiaoyangna
|
3cecf72861
|
铜墙铁壁
|
2021-01-07 16:22:36 +08:00 |
guowei
|
6c191263bd
|
Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
# Assets/ManagedResources/~Lua/Message/CommonProto.proto
# Assets/ManagedResources/~Lua/Message/Expedition.proto
# Assets/ManagedResources/~Lua/Message/Family.proto
# Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
# Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
|
2021-01-06 20:05:35 +08:00 |
guowei
|
d42cbc0a34
|
【鸿蒙阵bug修改】
|
2021-01-06 11:16:10 +08:00 |
guowei
|
0eae27d30d
|
【鸿蒙阵bug修改】
|
2021-01-06 10:03:38 +08:00 |
zhangqiang
|
ed65735dc5
|
【重置优化】将游戏中的各个玩法重置时间统一调整至0点
|
2021-01-04 14:27:18 +08:00 |
jiaoyangna
|
223c23f4bd
|
[狭路相逢] 提交
|
2020-12-30 15:56:11 +08:00 |
guowei
|
ca9a6a933b
|
【鸿蒙阵修改】
|
2020-12-29 20:36:37 +08:00 |
gaoxin
|
bf6fd2d13d
|
Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-12-26 20:22:23 +08:00 |
guowei
|
df79f56b72
|
【优化五星成长礼包、心魔试炼礼包】
|
2020-12-24 13:52:28 +08:00 |
jiaoyangna
|
5a0bece22e
|
所向披靡修改
|
2020-12-24 10:23:02 +08:00 |
guowei
|
2ac574ff06
|
【鸿蒙阵bug】更新
|
2020-12-23 17:41:31 +08:00 |
ZhangBiao
|
8801a84c2b
|
【新将活动】商店跳转修复
|
2020-12-23 17:28:20 +08:00 |
guowei
|
0454746498
|
【鸿蒙阵】
|
2020-12-21 10:08:30 +08:00 |
guowei
|
f744e609a1
|
【鸿蒙阵剩余图片】
|
2020-12-18 16:31:28 +08:00 |
guowei
|
4f4542d53a
|
【鸿蒙阵】
|
2020-12-18 13:39:35 +08:00 |
jiaoyangna
|
9f01de23ea
|
[主题活动]
|
2020-12-18 11:22:54 +08:00 |
guowei
|
52d493ebc7
|
【鸿蒙阵】二次提交
|
2020-12-17 10:41:00 +08:00 |
jiaoyangna
|
0a1e1666f7
|
【博文多识】
|
2020-12-12 17:21:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
15eebe4584
|
【鸿蒙阵】 初版提交
|
2020-11-27 17:59:25 +08:00 |
zhangqiang
|
3f2029a681
|
旗开得胜 提交
|
2020-11-25 21:02:16 +08:00 |
jiaoyangna
|
3e7c24c029
|
【主题活动】降龙伏虎
|
2020-11-18 18:15:50 +08:00 |
jiaoyangna
|
358ecb8166
|
[玄机妙算] 提交
|
2020-11-12 15:10:52 +08:00 |
jiaoyangna
|
e8be02de87
|
[移山倒海] 提交
|
2020-11-06 10:49:08 +08:00 |
zhangqiang
|
cbe24364ec
|
【灵兽系统】 调主城的位置
|
2020-11-02 18:16:28 +08:00 |
zhangqiang
|
df8f8d6dd0
|
【灵兽系统】 加引导 和 特权加15日礼包 判断
|
2020-11-02 15:56:06 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
zhangqiang
|
c4a9cb99cf
|
【主题活动】commit
|
2020-10-30 10:08:54 +08:00 |
zhangqiang
|
6c1cf4de1a
|
【运筹帷幄】1
|
2020-10-30 10:08:41 +08:00 |
zhangqiang
|
6a0a52997c
|
变幻莫测 提交
|
2020-09-17 12:35:45 +08:00 |
jiaoyangna
|
06dcc9f41c
|
勇往直前 提交
|
2020-10-21 14:13:07 +08:00 |
ZhangBiao
|
f0e9063c97
|
关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改
|
2020-10-16 17:56:39 +08:00 |
jiaoyangna
|
aa9878a1f2
|
势不可挡 提交
|
2020-10-10 16:14:18 +08:00 |
jiaoyangna
|
31895e8e25
|
【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态
|
2020-10-12 16:56:44 +08:00 |
jiaoyangna
|
8ff0382e41
|
丹心碧血主界面icon 修改提交
|
2020-10-15 14:06:16 +08:00 |
jiaoyangna
|
7c38428100
|
丹心碧血图片提交
|
2020-10-15 14:04:45 +08:00 |
liujiaqi
|
783c61eed8
|
修复新玩家登陆卡在登陆100%
|
2020-09-27 20:40:20 +08:00 |
gaoxin
|
b3d15c1945
|
头像特效添加
|
2020-09-27 16:58:10 +08:00 |
JieLing
|
c3cce0b06e
|
百宝商会活动添加
|
2020-09-27 16:52:40 +08:00 |
ZhangBiao
|
e9b994126e
|
三界降魔
|
2020-09-27 16:43:42 +08:00 |
ZhangBiao
|
c4706208ef
|
三界除魔功能添加
|
2020-09-27 16:43:33 +08:00 |
jiaoyangna
|
17675838d7
|
漏提
|
2020-09-22 17:46:55 +08:00 |
jiaoyangna
|
51adf32101
|
漏提
|
2020-09-22 17:37:28 +08:00 |
ZhangBiao
|
8232879006
|
车迟排名界面调整、日常本底部适配、万象境“新”字bug修复
|
2020-09-04 14:30:39 +08:00 |
jiaoyangna
|
36b66f03e1
|
【破阵诛仙】 在线结束,主城入口显示0000不消失,点击入口黑屏
|
2020-09-10 15:08:13 +08:00 |
gaoxin
|
97eaf77009
|
主界面底部界面经验条显示调整
|
2020-09-01 17:12:00 +08:00 |
gaoxin
|
c6bdebeffb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
|
2020-09-01 14:38:29 +08:00 |
gaoxin
|
ae349123df
|
部分界面屏幕适配调整
|
2020-09-01 14:38:02 +08:00 |
zhangqiang
|
cf7b336eef
|
漏提
|
2020-09-01 09:37:51 +08:00 |
zhangqiang
|
a6fa4453e6
|
需求主城或关卡停留过长添加聊天气泡
|
2020-08-31 20:52:50 +08:00 |
gaoxin
|
2d9d097d98
|
修复巅峰赛按钮时间显示0的问题
|
2020-08-28 12:08:23 +08:00 |
gaoxin
|
5d03b4fea8
|
巅峰赛按钮当日五点开始显示
|
2020-08-28 01:24:32 +08:00 |
JieLing
|
0f3b38f85e
|
修复主界面巅峰赛按钮时间显示错误的问题
|
2020-08-27 11:49:58 +08:00 |
zhangqiang
|
c315cf768d
|
竞技场排行
|
2020-08-27 10:52:35 +08:00 |
gaoxin
|
093c6d1f41
|
竞技场按钮功能未开启不再显示
|
2020-08-26 18:18:12 +08:00 |
gaoxin
|
80e2f16169
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 17:58:51 +08:00 |
gaoxin
|
bab4148db6
|
主界面十绝阵,巅峰赛按钮添加
|
2020-08-26 17:58:23 +08:00 |
jiaoyangna
|
22fa2b0d4c
|
qinglong commit
|
2020-08-26 15:57:06 +08:00 |
jiaoyangna
|
d1ab290cf7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua
|
2020-08-25 16:26:13 +08:00 |
jiaoyangna
|
87cc8867c7
|
宝物 commit
|
2020-08-25 16:23:41 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
jiaoyangna
|
9ad0593572
|
qinglong redpoint commit
|
2020-08-25 11:21:42 +08:00 |
jiaoyangna
|
7ef2347d47
|
【破阵诛仙/超值基金】主城入口计时,够一天显示天,小于一天应该显示时分秒
|
2020-08-24 20:15:18 +08:00 |
ZhangBiao
|
76f5a343eb
|
云梦祈福入口时间、青龙秘宝时间显示
|
2020-08-24 18:51:05 +08:00 |
gaoxin
|
e806410e8a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-08-24 15:25:23 +08:00 |
ZhangBiao
|
939fa0227a
|
无尽入口例会、化虚进入修复、剪影仙踪
|
2020-08-24 15:20:00 +08:00 |
gaoxin
|
395c41ef79
|
Merge branch 'temp' into master_develop
|
2020-08-24 14:36:54 +08:00 |
jiaoyangna
|
fb4d9e0d45
|
commit
|
2020-08-22 22:27:52 +08:00 |
zhangqiang
|
fe00d8726a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 20:25:28 +08:00 |
zhangqiang
|
028761ebaf
|
打开暴力输出
|
2020-08-22 20:25:12 +08:00 |
jiaoyangna
|
056815a8b6
|
patch commit
|
2020-08-22 19:40:14 +08:00 |
gaoxin
|
4f8026425d
|
sdk添加上传新手数据的接口
|
2020-08-22 19:14:58 +08:00 |
ZhangBiao
|
be23f0c38a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 17:05:53 +08:00 |
ZhangBiao
|
8de86ce4ac
|
无尽副本入口
|
2020-08-22 17:05:37 +08:00 |
gaoxin
|
f2ae18778c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 17:02:48 +08:00 |
jiaoyangna
|
69a5b9b519
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
|
2020-08-22 16:46:17 +08:00 |
jiaoyangna
|
fa6bdeeb6a
|
huoqu huodongzhuangtai tijiao
|
2020-08-22 16:43:39 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
jiaoyangna
|
f0f8a5d69e
|
qinglong update
|
2020-08-22 15:42:07 +08:00 |
jiaoyangna
|
2646f9418a
|
|
2020-08-28 18:32:59 +08:00 |
ZhangBiao
|
b01a3f31f9
|
Merge branch '0副本/副本原版留存' into master_develop
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/MonsterGroup.xlsx
|
2020-08-20 15:00:23 +08:00 |
ZhangBiao
|
e9b8083148
|
|
2020-08-20 14:43:48 +08:00 |
jiaoyangna
|
fa1f5a7c35
|
五星成长礼提交
|
2020-08-19 22:03:47 +08:00 |
ZhangBiao
|
c9cb029494
|
无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
|
2020-08-18 10:49:21 +08:00 |
jiaoyangna
|
b2f5dbc2ca
|
xuanyuan update
|
2020-08-13 14:43:44 +08:00 |
jiaoyangna
|
39fb3d113c
|
xuyuan commit
|
2020-08-12 21:10:27 +08:00 |
zhangqiang
|
058b18bc6f
|
最新表 协议数据
|
2020-08-12 18:29:11 +08:00 |
ZhangBiao
|
5304368d56
|
神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
|
2020-08-12 17:03:39 +08:00 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +08:00 |
zhangqiang
|
b67b99ad93
|
无尽副本临时新增入口
|
2020-08-11 16:31:17 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
ZhangBiao
|
203514d85f
|
神将置换入口添加
|
2020-08-05 16:30:02 +08:00 |
ZhangBiao
|
ee19d26bd3
|
神将置换界面创建
|
2020-08-05 15:36:22 +08:00 |
ZhangBiao
|
c03e9336bc
|
"info" exception 修复
|
2020-07-29 14:37:12 +08:00 |
ZhangBiao
|
d2bacc77ca
|
bug修复
|
2020-07-28 22:41:27 +08:00 |
jiaoyangna
|
5d70187da8
|
副本修改提交
|
2020-07-28 20:51:28 +08:00 |
ZhangBiao
|
48ac527f1a
|
限时召唤 乾坤宝盒 页面整合
|
2020-07-28 09:48:02 +08:00 |
jiaoyangna
|
24f9860235
|
close supreme
|
2020-07-25 20:35:32 +08:00 |
jiaoyangna
|
f511cf3380
|
车迟斗法挑战提交
|
2020-07-25 19:31:55 +08:00 |
jiaoyangna
|
b424927bbb
|
tupian tijiao
|
2020-07-23 16:01:26 +08:00 |
jiaoyangna
|
aefa2b0cac
|
添加一个万象境的入口列表
|
2020-07-23 15:42:42 +08:00 |
jiaoyangna
|
cafa630185
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2020-07-22 20:19:57 +08:00 |
jiaoyangna
|
aa86f77fea
|
【充值】表里配的5级,实际创角就有入口
|
2020-07-21 11:31:05 +08:00 |
jiaoyangna
|
03107d240a
|
轩辕宝镜提交
|
2020-07-21 10:42:20 +08:00 |
jiaoyangna
|
9b7e47aaef
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# data_execl/base_data/RaceTowerConfig.xlsx
|
2020-07-20 20:00:31 +08:00 |
jiaoyangna
|
04e9a24db0
|
xuanyuanmirror tijiao
|
2020-07-20 19:46:08 +08:00 |
zhangqiang
|
f24e7cbef3
|
排行榜请求修改
|
2020-07-20 16:38:26 +08:00 |
zhangqiang
|
c6b5321424
|
bug
|
2020-07-17 20:52:44 +08:00 |
zhangqiang
|
98670958a0
|
首冲拍脸 寻宝红点条件
|
2020-07-17 13:56:30 +08:00 |
zhangqiang
|
ebca764861
|
首冲
|
2020-07-17 11:27:03 +08:00 |
ZhangBiao
|
cb56ec6b22
|
森罗小游戏bug修改
|
2020-07-16 16:59:46 +08:00 |
jiaoyangna
|
3a85c6e339
|
分解,限时召唤提交
|
2020-07-10 18:29:38 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
75a3f83194
|
内网0.15.16 外网 0.16.7
|
2020-06-19 20:19:35 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
266b9065d8
|
测试版本 带热更 0.15.1
|
2020-05-15 16:52:35 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |