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 |
zhangshanxue
|
39fc099fe6
|
Merge branch 'china/dev' into china/xq
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-09-03 16:01:20 +08:00 |
ZhangBiao
|
21d6b01106
|
【修行】元婴期突破空白文字修改
|
2021-09-03 15:10:38 +08:00 |
jiaoyangna
|
56af6f1a11
|
第一次bug修改提交
|
2021-08-31 20:22:59 +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 |
gaoxin
|
792a72676a
|
【适龄提示】
|
2021-08-27 14:20:36 +08:00 |
jiaoyangna
|
ab1a4ea627
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-26 17:42:25 +08:00 |
gaoxin
|
c325bf563f
|
Revert 回滚错误的合并 4f19f12612
|
2021-08-26 16:43:27 +08:00 |
jiaoyangna
|
0c7e38a715
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-25 15:25:54 +08:00 |
ZhangBiao
|
fab5388536
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-08-17 13:47:27 +08:00 |
ZhangBiao
|
9971d286ea
|
【寻宝迷踪】人物箭头提交
|
2021-08-16 15:37:01 +08:00 |
jiaoyangna
|
74f1bc4d4f
|
太初秘卷适配修改提交
|
2021-08-16 13:57:13 +08:00 |
jiaoyangna
|
39f355c0d1
|
适配修改提交
|
2021-08-12 18:35:23 +08:00 |
jiaoyangna
|
76dbc01270
|
Merge branch 'china/dev' into 0功能/silingshilian
|
2021-08-12 15:54:58 +08:00 |
ZhangBiao
|
a0ef88e58d
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-08-12 14:56:26 +08:00 |
jiaoyangna
|
792b533fa0
|
太初秘卷修改提交
|
2021-08-12 11:02:21 +08:00 |
ZhangBiao
|
aae540d144
|
【寻宝迷踪】提交
|
2021-08-09 14:18:31 +08:00 |
ZhangBiao
|
ab0dece261
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-06 11:32:10 +08:00 |
jiaoyangna
|
6b8c2f2f3c
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.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/Carbon/CarbonManager.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
|
2021-08-06 11:15:13 +08:00 |
jiaoyangna
|
ed3494e263
|
【ID1009947】
【优化】四元阵界面 新增界面特效
|
2021-08-05 15:09:58 +08:00 |
ZhangBiao
|
87cf2102fe
|
【寻宝迷踪】添加资源
|
2021-08-04 18:16:36 +08:00 |
zhangqiang
|
18dd4832a6
|
【资源冲突】
|
2021-07-31 13:45:59 +08:00 |
jiaoyangna
|
0480506f53
|
【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
|
2021-07-29 18:36:30 +08:00 |
liujiaqi
|
82677ad40c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-26 12:02:32 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
gaoxin
|
3e11938166
|
【meta】
|
2021-07-27 10:06:56 +08:00 |
ZhangBiao
|
74c713c65b
|
【主题活动】加强限时商市,珍奇宝阁入口按钮的辨识度
|
2021-07-26 19:00:41 +08:00 |
ZhangBiao
|
8e5664f85c
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/26,17:54:54
|
2021-07-26 17:54:55 +08:00 |
liujiaqi
|
6ae640d65a
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/26,12:00:55
|
2021-07-26 12:01:02 +08:00 |
ZhangBiao
|
d571e3126d
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,18:33:47
|
2021-07-23 18:33:47 +08:00 |
wangzhenxing
|
887f071868
|
[功能]============15日登陆预告预设提交
|
2021-07-23 15:30:40 +08:00 |
wangzhenxing
|
02cea65055
|
[称号]====跨服称号资源提交
|
2021-07-23 11:20:05 +08:00 |
ZhangBiao
|
3d105fae48
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:36:13
|
2021-07-23 10:36:13 +08:00 |
ZhangBiao
|
7f53ab4371
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:35:43
|
2021-07-23 10:35:43 +08:00 |
ZhangBiao
|
133bce077e
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:35:05
|
2021-07-23 10:35:06 +08:00 |
ZhangBiao
|
4ebfef77f6
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:34:30
|
2021-07-23 10:34:31 +08:00 |
ZhangBiao
|
a33be944cc
|
【万象商会】提交
|
2021-07-22 19:53:25 +08:00 |
ZhangBiao
|
db258d27cb
|
【副本界面】调整
|
2021-07-22 15:13:24 +08:00 |
ZhangBiao
|
190f3722a8
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 14:04:11 +08:00 |
zhangqiang
|
b395410ac1
|
Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-20 18:09:07 +08:00 |
jiaoyangna
|
4d8bf852d4
|
Revert "bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40"
This reverts commit 01b3f79c43.
|
2021-07-19 14:10:11 +08:00 |
jiaoyangna
|
01b3f79c43
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40
|
2021-07-19 14:09:40 +08:00 |
luyao
|
3baf85791e
|
主题活动,限时召唤中。【更换武将】图片资源替换为【更换神将】
|
2021-07-16 15:15:25 +08:00 |
luyao
|
82e5b6fd5c
|
【点将台抽卡】召唤标题修改(猎妖师 变为 神将)
|
2021-07-16 11:05:42 +08:00 |
ZhangBiao
|
7e17f8c3a1
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-07-15 19:48:50 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b97a35ce8
|
mata 文件修改提交
|
2021-07-15 19:44:55 +08:00 |
DESKTOP-98AVA47\Administrator
|
695a61abaa
|
Merge branch '0优化/主题活动' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
|
2021-07-15 18:52:59 +08:00 |
DESKTOP-98AVA47\Administrator
|
4bd4f1f483
|
Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
# 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/Expert/PatFaceManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-15 16:24:35 +08:00 |
ZhangBiao
|
109a109301
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/Atlas/CarbonNewAtlas.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta
# Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/StreamingAssets/Android.meta
|
2021-07-15 16:19:05 +08:00 |