|  DESKTOP-C3M45P4\dengdan | 612dbb622e | 新增角色立绘 | 2024-04-03 15:49:20 +08:00 | 
				
					
						|  DESKTOP-C3M45P4\dengdan | 50b50a80d6 | 新增角色立绘 | 2024-03-26 11:18:45 +08:00 | 
				
					
						|  DESKTOP-C3M45P4\dengdan | 526cfcae9f | 增加猪八戒立绘 | 2024-03-25 16:38:54 +08:00 | 
				
					
						|  DESKTOP-C3M45P4\dengdan | 428c81c98e | 新增罗刹 | 2024-03-13 19:06:33 +08:00 | 
				
					
						|  DESKTOP-C3M45P4\dengdan | 0ecdac9ded | 增加新英雄 | 2024-02-27 15:58:11 +08:00 | 
				
					
						|  DESKTOP-C3M45P4\dengdan | fc0948faf9 | 替换新英雄立绘 | 2024-02-23 19:07:56 +08:00 | 
				
					
						|  DESKTOP-C3M45P4\dengdan | d7e503e486 | 增加新英雄 | 2024-01-23 14:36:26 +08:00 | 
				
					
						|  DESKTOP-C3M45P4\dengdan | a583260d2b | 增加女儿国王spine | 2024-01-19 18:53:16 +08:00 | 
				
					
						|  DESKTOP-C3M45P4\dengdan | 016d27435f | 增加新赵公明spine | 2024-01-19 18:50:12 +08:00 | 
				
					
						|  wangzhenxing | 3a09658c74 | 女儿国王预设修改 | 2023-06-06 19:40:31 +08:00 | 
				
					
						|  wangzhenxing | e0f0d8686b | 女儿国王spine修改 | 2023-06-06 17:23:20 +08:00 | 
				
					
						|  wangzhenxing | ebfddaad60 | 法宝心愿修改提交 | 2023-06-06 15:57:53 +08:00 | 
				
					
						|  wangzhenxing | 0708630890 | 新英雄  ===================雨女资源提交 | 2023-02-28 10:59:28 +08:00 | 
				
					
						|  yuanshuai | 113e0ceb73 | 数字游戏缺失资源提交 | 2022-07-13 18:37:23 +08:00 | 
				
					
						|  yuanshuai | d952b9a44c | 数字游戏模块提交 | 2022-07-11 15:43:04 +08:00 | 
				
					
						|  gaoxin | 8558152b29 | 【立绘】东华帝君,孟婆立绘回归 | 2022-03-02 19:00:38 +08:00 | 
				
					
						|  wangzhenxing | d03215cc16 | [资源]========神菩提提交 (cherry picked from commit fb9ad83e40f24e680cbc395ba82f777db7422e7e) | 2022-02-17 10:40:12 +08:00 | 
				
					
						|  wangzhenxing | d7749de932 | 【资源】======女儿国王 申公豹spine修改 | 2021-12-27 15:45:21 +08:00 | 
				
					
						|  luyao | d62532c90c | 【坐骑】资源名冲突修改 | 2021-12-23 11:46:13 +08:00 | 
				
					
						|  wangzhenxing | b7bfc1d867 | 【资源】======虎年坐骑提交 | 2021-12-22 16:15:51 +08:00 | 
				
					
						|  wangzhenxing | 9c07c341e5 | 【资源】===嫦娥新动作提交 | 2021-12-17 15:08:30 +08:00 | 
				
					
						|  gaoxin | 2b642464a5 | 【立绘】伏羲立绘删除脚下的阵 | 2021-11-29 13:19:29 +08:00 | 
				
					
						|  gaoxin | 13ed0776b6 | Merge branch 'china/dev' into china/dev_res # Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/Spine/c_0023_02/c_0023_02.png.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua | 2021-11-23 11:35:33 +08:00 | 
				
					
						|  wangzhenxing | 1361867887 | 【坐骑】=======四不像提交 | 2021-11-16 13:31:28 +08:00 | 
				
					
						|  gaoxin | 964f45b245 | 【资源】孟姜女不动 | 2021-11-09 10:28:26 +08:00 | 
				
					
						|  gaoxin | 67da83d8b3 | 【资源】新和谐资源上传 | 2021-11-09 10:28:18 +08:00 | 
				
					
						|  gaoxin | 37de3d19b0 | 【立绘】修复和谐资源不动的问题 | 2021-11-09 10:27:52 +08:00 | 
				
					
						|  gaoxin | 9314e90111 | 【资源】孟姜女不动 | 2021-11-08 16:05:53 +08:00 | 
				
					
						|  gaoxin | aba3d59a04 | 【资源】新和谐资源上传 | 2021-11-08 15:27:17 +08:00 | 
				
					
						|  gaoxin | 563cb97fa9 | Merge branch 'china/dev' into china/dev_res # Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_skill_s1_aoBing/Animation/fx_aobing_wangqiuwangzhi_1_anim.anim
#	Assets/ManagedResources/EffectResSkill/Effect_skill_s1_aoBing/Animation/fx_aobing_wangqiuwangzhi_1_ctrl.controller
#	Assets/ManagedResources/EffectResSkill/Effect_skill_yangjian_gai.meta
#	Assets/ManagedResources/EffectResSkill/Effect_skill_yangjian_gai/Materials.meta
#	Assets/ManagedResources/EffectResSkill/Effect_skill_yangjian_gai/Prefab.meta
#	Assets/ManagedResources/EffectResSkill/Effect_skill_yangjian_gai/Textures.meta
#	Assets/ManagedResources/Icon/Hero/c_negw_00009_t3.png
#	Assets/ManagedResources/Icon/Item/c_zuoqi_qilin.png
#	Assets/ManagedResources/Icon/Item/icon_zuoqi02.png | 2021-11-08 15:20:43 +08:00 | 
				
					
						|  gaoxin | 4e68982a6a | 【坐骑】新增九尾狐坐骑资源 | 2021-11-01 11:59:31 +08:00 | 
				
					
						|  gaoxin | bf6c9c3d75 | 【坐骑】新增九尾狐坐骑资源 | 2021-11-01 11:58:50 +08:00 | 
				
					
						|  gaoxin | 8d9a1b264d | 【立绘】修复和谐资源不动的问题 | 2021-11-01 11:00:03 +08:00 | 
				
					
						|  jiaoyangna | 53e664c775 | 敖丙立绘提交 | 2021-10-29 17:47:58 +08:00 | 
				
					
						|  gaoxin | bba1b58ca2 | 【皮肤】牛魔王,燃灯live2d导入 | 2021-10-25 13:44:51 +08:00 | 
				
					
						|  jiaoyangna | b886c7024c | 坐骑资源提交 | 2021-10-14 18:15:07 +08:00 | 
				
					
						|  jiaoyangna | 8b4f447466 | 坐骑立绘提交 | 2021-10-14 12:15:20 +08:00 | 
				
					
						|  ZhangBiao | e8bfd73a9d | 【织女】立绘不动修改 | 2021-10-09 11:14:24 +08:00 | 
				
					
						|  jiaoyangna | 066ecb8f52 | 敖丙立绘提交 | 2021-10-08 17:33:37 +08:00 | 
				
					
						|  gaoxin | 4e441f4942 | 【资源】女儿国王默认动画添加 | 2021-09-24 14:53:04 +08:00 | 
				
					
						|  gaoxin | 00db8bf660 | 【资源】女儿国王皮肤资源上传 | 2021-09-24 14:52:58 +08:00 | 
				
					
						|  gaoxin | 8fd74e7e99 | 【资源】坐骑麒麟live2d上传 | 2021-09-24 12:40:35 +08:00 | 
				
					
						|  gaoxin | 4e53eb93eb | 【资源】坐骑麒麟live2d上传 | 2021-09-23 14:16:40 +08:00 | 
				
					
						|  gaoxin | 181c7ae6a2 | 【资源】女儿国王默认动画添加 | 2021-09-14 15:36:24 +08:00 | 
				
					
						|  gaoxin | c87cbac163 | 【资源】女儿国王皮肤资源上传 | 2021-09-14 15:19:36 +08:00 | 
				
					
						|  gaoxin | dec3a4d338 | 【资源】织女新立绘添加 | 2021-08-31 18:34:16 +08:00 | 
				
					
						|  gaoxin | eed381315d | 【提审】添加石矶提审服资源 | 2021-08-28 15:04:13 +08:00 | 
				
					
						|  gaoxin | a3f9967651 | 【提审服】精卫穿秋裤,慈航穿棉袄 | 2021-08-27 15:23:03 +08:00 | 
				
					
						|  jiaoyangna | dd076dfb6a | 立绘删除 | 2021-07-29 11:25:36 +08:00 | 
				
					
						|  gaoxin | 01e033ad00 | 【资源】玉皇大帝皮肤资源 | 2021-06-21 15:14:02 +08:00 |