ZhangBiao
|
9792e57e9b
|
【系统弹窗】提交
|
2021-03-05 17:27:57 +08:00 |
ZhangBiao
|
3ddc796ec2
|
【首领来袭】完成
|
2021-02-25 21:08:11 +08:00 |
ZhangBiao
|
c2c712c3f9
|
【战斗boss详情】UIdata提交
|
2021-02-22 20:22:26 +08:00 |
ZhangBiao
|
b994557866
|
【boss介绍界面】创建提交
|
2021-02-22 20:19:16 +08:00 |
zhangqiang
|
1c95b576f0
|
Merge branch '0功能/鸿蒙门阵' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
|
2021-02-19 10:54:36 +08:00 |
ZhangBiao
|
78bc7e8ab3
|
Merge branch '0功能/本周版本优化内容' into 0活动开发聚集地/牛转乾坤
|
2021-01-26 13:49:08 +08:00 |
jiaoyangna
|
22aee8fe41
|
tips loading tijiao
|
2021-01-26 10:59:32 +08:00 |
ZhangBiao
|
20857d4e27
|
【牛转钱坤】差不多完事了
|
2021-01-20 18:27:23 +08:00 |
ZhangBiao
|
0146bc8512
|
【牛转钱坤】代码提交
|
2021-01-20 15:31:39 +08:00 |
DESKTOP-98AVA47\Administrator
|
040971534e
|
【巅峰赛限时头像修改】
|
2021-01-15 21:06:48 +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
|
90df0aef7e
|
【UI占位 变更】
|
2020-12-17 11:29:16 +08:00 |
guowei
|
861b02f0c8
|
【鸿蒙阵初版】
|
2020-12-15 11:03:34 +08:00 |
guowei
|
997ed5d9ff
|
鸿蒙阵选人界面
|
2020-12-02 09:59:18 +08:00 |
ZhangBiao
|
2d51e11e10
|
【神将来袭】代码完善
|
2020-12-01 15:52:34 +08:00 |
guowei
|
308fd2f197
|
【鸿蒙阵】初始界面配置
|
2020-11-27 18:10:30 +08:00 |
DESKTOP-98AVA47\Administrator
|
15eebe4584
|
【鸿蒙阵】 初版提交
|
2020-11-27 17:59:25 +08:00 |
zhangqiang
|
e9d984b329
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-11-12 19:34:29 +08:00 |
ZhangBiao
|
a5c36cf58a
|
【灵兽宝阁】未开启更换灵兽版本
|
2020-11-12 17:11:18 +08:00 |
zhangqiang
|
adf9c87ac2
|
【灵兽提交】bug修改
|
2020-11-11 20:21:13 +08:00 |
ZhangBiao
|
1ba753044f
|
【灵兽宝阁】抽卡逻辑完善了
|
2020-11-11 16:53:04 +08:00 |
zhangqiang
|
6a1693939c
|
【觉醒】 觉醒添加图鉴
|
2020-11-09 20:05:51 +08:00 |
ZhangBiao
|
5e130a7585
|
Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
# Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
# Assets/ManagedResources/Effects/Model/Materials.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-11-06 16:17:12 +08:00 |
gaoxin
|
d668e4ffc3
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
|
2020-11-06 11:19:46 +08:00 |
gaoxin
|
1ac0e6fc53
|
【战斗】添加新的假战斗功能
|
2020-11-06 11:18:09 +08:00 |
ZhangBiao
|
6f75850ae4
|
【易经宝库】提交
|
2020-11-05 19:10:20 +08:00 |
ZhangBiao
|
476057bd1c
|
【易经宝库】主界面奖励显示 通用奖励界面创建
|
2020-11-04 19:51:58 +08:00 |
jiaoyangna
|
509357e333
|
Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2020-11-04 10:54:54 +08:00 |
jiaoyangna
|
e92e63444b
|
皮肤提交
|
2020-11-03 17:27:32 +08:00 |
ZhangBiao
|
f79499faea
|
【易经宝库】开始获取活动数据
|
2020-11-03 09:58:37 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
ZhangBiao
|
8a1a1b2442
|
【社稷大典】提交3
|
2020-10-24 18:29:05 +08:00 |
gaoxin
|
619ce2ea52
|
【逍遥游】筛子摇动和事件触发音效添加
|
2020-10-20 17:43:18 +08:00 |
gaoxin
|
19135670ce
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-10-19 20:40:14 +08:00 |
gaoxin
|
364c9c99fc
|
【逍遥游】功能合并到local分支
|
2020-10-19 20:37:53 +08:00 |
ZhangBiao
|
e39706e312
|
遴选 社稷大典中对奖励界面的修改,到竞技场界面修改
|
2020-10-19 14:01:30 +08:00 |
ZhangBiao
|
09c3da664e
|
通用奖励界面 设计大典->竞技场界面修改
|
2020-10-19 13:54:08 +08:00 |
ZhangBiao
|
c4706208ef
|
三界除魔功能添加
|
2020-09-27 16:43:33 +08:00 |
JieLing
|
c6391090f2
|
三界除魔界面添加
|
2020-09-27 16:38:44 +08:00 |
zhangqiang
|
24f6333726
|
线上问题: 试炼节点显示立绘与招募得到的不一致 前端修改
|
2020-09-22 17:33:57 +08:00 |
zhangqiang
|
9b2b85f6b5
|
关闭sdk数据打点,使用海外sdk时需打开
|
2020-08-25 10:21:31 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
zhangqiang
|
e1b223e83f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/PrivilegeTypeConfig.xlsx
# data_execl/base_data/RewardGroup.xlsx
# data_execl/base_data/RewardItemConfig.xlsx
# data_execl/base_data/SpecialConfig.xlsx
# data_execl/base_data/StoreConfig.xlsx
# data_execl/base_data/UIConfig.xlsx
|
2020-08-22 13:59:35 +08:00 |
zhangqiang
|
b725617a8d
|
公会副本提交
|
2020-08-21 15:52:49 +08:00 |
jiaoyangna
|
6b0af3d7fb
|
pozhenzhuxian commit
|
2020-08-20 17:36:19 +08:00 |
zhangqiang
|
869481a2cd
|
公会副本部分提交
|
2020-08-19 17:28:17 +08:00 |
jiaoyangna
|
4e1236de8c
|
qinglongserecttreasure commit
|
2020-08-19 10:05:01 +08:00 |
jiaoyangna
|
9f186311b3
|
xuanyuan
|
2020-08-11 15:11:33 +08:00 |
zhangqiang
|
32c788b8ac
|
神将合成代码
|
2020-08-08 18:18:26 +08:00 |
zhangqiang
|
17b6db91e2
|
英雄合成提交部分代码
|
2020-08-08 15:51:55 +08:00 |