ZhangBiao
|
28d3f421bc
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息提交
|
2022-01-14 15:44:45 +08:00 |
gaoxin
|
dfb04baf75
|
【限时升星】添加可选择的升星有礼活动
|
2022-01-08 18:40:04 +08:00 |
ZhangBiao
|
90ffb03c25
|
【家园】协议提交
|
2022-01-06 16:46:31 +08:00 |
ZhangBiao
|
ee7dc987a8
|
【家园】资源
|
2022-01-05 10:40:12 +08:00 |
ZhangBiao
|
c0d27feac2
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2022-01-05 10:16:25 +08:00 |
ZhangBiao
|
cf9cbc5ac9
|
【家园】摘星阁装备属性加持+战斗力
|
2021-12-31 13:44:11 +08:00 |
jiaoyangna
|
57b0689de6
|
【ID1010911】
【森罗优化】退出森罗幻境时弹出累积收益
|
2021-12-30 18:06:36 +08:00 |
ZhangBiao
|
630d56c810
|
【家园】装备强化升级
|
2021-12-29 20:17:45 +08:00 |
ZhangBiao
|
dbc3395945
|
【家园】详情
|
2021-12-24 09:33:56 +08:00 |
ZhangBiao
|
6fe4e5d3f6
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-23 14:49:47 +08:00 |
ZhangBiao
|
f676ae8478
|
【家园】提交
|
2021-12-23 14:38:02 +08:00 |
gaoxin
|
5eec5952ef
|
【协议】更新到最新
|
2021-12-23 14:37:31 +08:00 |
ZhangBiao
|
a197f16837
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-12-17 15:46:53 +08:00 |
ZhangBiao
|
68d6e39882
|
【协议】提交
|
2021-12-16 16:58:20 +08:00 |
ZhangBiao
|
0b9bd476dd
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-13 17:26:43 +08:00 |
gaoxin
|
c46d18eb17
|
【关卡新条件】好感度等级获取方式修改,逍遥游完成次数协议添加
|
2021-12-13 15:48:26 +08:00 |
ZhangBiao
|
f444315fee
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-10 18:32:41 +08:00 |
gaoxin
|
8ba26cd8b4
|
【协议】公会副本伤害数值类型修改
|
2021-12-10 18:30:26 +08:00 |
gaoxin
|
3063e8244c
|
【协议】公会副本伤害数据类型修改
|
2021-12-10 18:09:23 +08:00 |
ZhangBiao
|
bab62f274c
|
【命格】提交
|
2021-12-10 11:01:44 +08:00 |
ZhangBiao
|
464ab967ef
|
【命格】提交
|
2021-12-07 15:57:33 +08:00 |
ZhangBiao
|
eb1a9f29e5
|
【命格】测试按钮提交
|
2021-12-07 15:40:36 +08:00 |
ZhangBiao
|
3ad898f8af
|
【命格】提交
|
2021-12-07 11:50:03 +08:00 |
jiaoyangna
|
d9f71e2f48
|
大闹天宫添加神魂等级
|
2021-12-06 17:47:14 +08:00 |
ZhangBiao
|
4d1799a124
|
【连购礼包】提交
|
2021-12-02 17:13:33 +08:00 |
jiaoyangna
|
c0c8a6710c
|
身外化身提交
|
2021-11-26 11:08:48 +08:00 |
jiaoyangna
|
4d887421ea
|
身外化身提交
|
2021-11-18 11:55:26 +08:00 |
jiaoyangna
|
ec48fa55f0
|
Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-11-16 17:34:22 +08:00 |
jiaoyangna
|
e6f4e50656
|
法宝聚灵
|
2021-11-15 18:24:39 +08:00 |
ZhangBiao
|
9fca63f5a1
|
【成长基金】配合后端修改
|
2021-11-15 15:44:02 +08:00 |
jiaoyangna
|
057ec06b4c
|
协议修改提交
|
2021-11-05 15:14:00 +08:00 |
gaoxin
|
01b322ad9b
|
【周卡】协议误删恢复
|
2021-11-04 11:36:47 +08:00 |
jiaoyangna
|
596c8477d3
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-04 09:29:56 +08:00 |
gaoxin
|
d23318b53d
|
【周卡】红点添加,协议修改,推送逻辑添加
|
2021-10-29 16:43:53 +08:00 |
jiaoyangna
|
93d0f294e0
|
协议提交
|
2021-10-29 13:27:23 +08:00 |
gaoxin
|
0fcf94a9c8
|
【周卡】协议,界面,逻辑搭建完成
|
2021-10-29 09:42:33 +08:00 |
jiaoyangna
|
ec3cee0ebb
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Icon/Item/icon_sbx.png.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-28 16:52:28 +08:00 |
jiaoyangna
|
d398c21668
|
神魂提交
|
2021-10-27 12:50:15 +08:00 |
wangzhenxing
|
a38fe30800
|
[主角技能]=====注重主角立绘等级显示修改
|
2021-10-26 18:03:02 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
wangzhenxing
|
d51a4292f3
|
协议提交 主角技能图标显示修改 玉虚战斗记录敌方分数修改
|
2021-10-22 18:30:09 +08:00 |
jiaoyangna
|
acc912a0e7
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
|
2021-10-22 15:52:33 +08:00 |
jiaoyangna
|
f5dc4a20b2
|
神魂出版提交
|
2021-10-22 15:47:59 +08:00 |
ZhangBiao
|
d8da0bb26a
|
【协议】补提
|
2021-10-22 09:33:54 +08:00 |
gaoxin
|
630271bf6c
|
【挚礼月卡】修复金额刷新不及时的问题
|
2021-10-20 19:15:40 +08:00 |
ZhangBiao
|
6a3c9ccd25
|
【主角修为】问号提交
|
2021-10-20 18:35:30 +08:00 |
ZhangBiao
|
1e3b3c9f27
|
【御剑行】修改提交
|
2021-10-20 18:31:59 +08:00 |
ZhangBiao
|
d774b09a63
|
【御剑行】协议和资源提交
|
2021-10-20 14:04:40 +08:00 |
ZhangBiao
|
f75e42d9c9
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.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/JumpManager.lua
|
2021-10-20 13:41:32 +08:00 |
ZhangBiao
|
a387432369
|
【主角修为】提交
|
2021-10-19 18:34:10 +08:00 |
ZhangBiao
|
3d0e6a4be4
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-18 11:35:58 +08:00 |
jiaoyangna
|
b50e5ee2bf
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_zn01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-10-18 10:38:49 +08:00 |
jiaoyangna
|
097d5cf1cc
|
神魂初版提交
|
2021-10-18 10:36:32 +08:00 |
jiaoyangna
|
450d426232
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-10-15 10:05:22 +08:00 |
wangzhenxing
|
444f8259ee
|
玉虚论道主界面请求添加类型
|
2021-10-14 21:30:35 +08:00 |
ZhangBiao
|
67026aa355
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-10-14 16:13:07 +08:00 |
jiaoyangna
|
ac0221b89f
|
白金装备修改提交
|
2021-10-14 15:05:36 +08:00 |
jiaoyangna
|
4f580146bd
|
【ID1010465】
增加白金装备图鉴
|
2021-10-14 12:01:55 +08:00 |
ZhangBiao
|
bb9533781d
|
【御剑行】提交
|
2021-10-13 19:15:39 +08:00 |
ZhangBiao
|
414ab1f3d9
|
【御剑行】提交
|
2021-10-13 17:38:32 +08:00 |
ZhangBiao
|
6870073129
|
【御剑行】排行完成
|
2021-10-13 15:39:47 +08:00 |
wangzhenxing
|
2237084155
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-10-12 20:08:46 +08:00 |
ZhangBiao
|
533bd25780
|
【御剑行】提交
|
2021-10-12 15:53:57 +08:00 |
wangzhenxing
|
d8a0a0e8c1
|
玉虚提交
|
2021-10-11 16:30:33 +08:00 |
ZhangBiao
|
294147b9ba
|
【御剑行】提交
|
2021-10-11 14:37:33 +08:00 |
jiaoyangna
|
8d91a6d875
|
协议提交
|
2021-10-08 13:09:13 +08:00 |
jiaoyangna
|
33acb35f82
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-09-28 09:52:22 +08:00 |
jiaoyangna
|
1152586ff1
|
好感度提交
|
2021-09-26 09:54:58 +08:00 |
gaoxin
|
b32183f20a
|
【玩家数据】添加服务器开启时间字段
|
2021-09-23 14:54:12 +08:00 |
jiaoyangna
|
c3dfb94905
|
好感度协议提交
|
2021-09-23 13:47:41 +08:00 |
jiaoyangna
|
d6002c5242
|
玲珑报镜十连修改提交
|
2021-09-23 09:51:45 +08:00 |
jiaoyangna
|
a8eeec83f6
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
|
2021-09-22 20:53:08 +08:00 |
jiaoyangna
|
529094b6ad
|
好感度第一次提交
|
2021-09-22 20:47:13 +08:00 |
yuanshuai
|
e33fad0054
|
最新协议提交
|
2021-09-22 15:20:25 +08:00 |
yuanshuai
|
db18313495
|
Merge branch '0功能/四象心法' into china/dev
# Conflicts:
# Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta
# Assets/ManagedResources/Icon/Item/r_yjsp.png.meta
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/ActivityProto.proto
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
# Assets/ManagedResources/~Lua/Message/ChatProto.proto
# Assets/ManagedResources/~Lua/Message/CommonProto.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/GeneralPanel/GeneralInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-09-22 15:12:32 +08:00 |
ZhangBiao
|
1c191a78b9
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
|
2021-09-22 11:46:24 +08:00 |
wangzhenxing
|
a7f0c42cae
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
Assets/ManagedResources/~Lua/View/UpView.lua
|
2021-09-18 11:52:01 +08:00 |
ZhangBiao
|
ad4c218f01
|
【七界试炼】提交
|
2021-09-17 13:42:27 +08:00 |
ZhangBiao
|
faacb77b2e
|
【协议】meta提交
|
2021-09-15 15:34:48 +08:00 |
ZhangBiao
|
045134941d
|
【鸿蒙阵】协议
|
2021-09-15 15:19:38 +08:00 |
ZhangBiao
|
599fe0dcee
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
|
2021-09-14 17:54:18 +08:00 |
ZhangBiao
|
fa5446d6d2
|
【鸿蒙阵】跨天英雄等级为0修复
|
2021-09-14 17:32:06 +08:00 |
wangzhenxing
|
d056a2dd70
|
玉虚论道提交
|
2021-09-14 10:10:57 +08:00 |
ZhangBiao
|
94ed6ad618
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2021-09-13 13:56:43 +08:00 |
wangzhenxing
|
4b5c55a1ab
|
qqq
|
2021-09-11 15:05:37 +08:00 |
ZhangBiao
|
d6725f3320
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
|
2021-09-10 16:39:43 +08:00 |
wangzhenxing
|
e2f7284507
|
qqqq
|
2021-09-10 15:50:24 +08:00 |
ZhangBiao
|
2d003aaafd
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-09-10 10:33:44 +08:00 |
ZhangBiao
|
cef2b42bcc
|
【七界试炼】提交
|
2021-09-10 10:30:50 +08:00 |
yuanshuai
|
a5271e5a38
|
【四象心法】协议提交
|
2021-09-10 09:51:57 +08:00 |
yuanshuai
|
4c66f50e66
|
Merge branch 'china/dev' into 0功能/四象心法
# Conflicts:
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
|
2021-09-10 09:38:55 +08:00 |
yuanshuai
|
247ad9fdc7
|
【四象心法提交】
|
2021-09-09 20:45:12 +08:00 |
wangzhenxing
|
a1c21eb441
|
qqqqq
|
2021-09-09 20:32:02 +08:00 |
wangzhenxing
|
a58b5f2d88
|
玉虚论道提交
|
2021-09-09 11:48:09 +08:00 |
jiaoyangna
|
49a4b32138
|
四灵第二次修改
|
2021-09-01 10:43:57 +08:00 |
jiaoyangna
|
dd93f737ff
|
排行榜上好友宝器修改
|
2021-08-31 15:05:17 +08:00 |
jiaoyangna
|
13f74e0185
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-31 11:39:16 +08:00 |
ZhangBiao
|
12c2fd7316
|
【推荐公会】增加分页请求
|
2021-08-27 15:59:22 +08:00 |
jiaoyangna
|
ae15e4899a
|
协议提交
|
2021-08-24 14:34:24 +08:00 |
ZhangBiao
|
6fc59dbe11
|
【太初密卷】协议提交
|
2021-08-23 20:46:50 +08:00 |